Commit 003f57a

committed

dropped format_relation_name from wrapping get_resource_type*

This isnt required anymore as the get_resource_type calls handle this

1 parent b2df153 commit 003f57aCopy full SHA for 003f57a

File tree

-7

lines changed

-7

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`from django.utils.translation import ugettext_lazy as _`
`6`	`6`
`7`	`7`	`from rest_framework_json_api.exceptions import Conflict`
`8`		`-from rest_framework_json_api.utils import format_relation_name, Hyperlink, \`
	`8`	`+from rest_framework_json_api.utils import Hyperlink, \`
`9`	`9`	`get_resource_type_from_queryset, get_resource_type_from_instance`
`10`	`10`
`11`	`11`
`@@ -118,7 +118,7 @@ def to_representation(self, value):`
`118`	`118`	`else:`
`119`	`119`	`pk = value.pk`
`120`	`120`
`121`		`- return OrderedDict([('type', format_relation_name(get_resource_type_from_instance(value))), ('id', str(pk))])`
	`121`	`+ return OrderedDict([('type', get_resource_type_from_instance(value)), ('id', str(pk))])`
`122`	`122`
`123`	`123`	`@property`
`124`	`124`	`def choices(self):`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,9 @@`
`3`	`3`	`from rest_framework.serializers import *`
`4`	`4`
`5`	`5`	`from rest_framework_json_api.relations import ResourceRelatedField`
`6`		`-from rest_framework_json_api.utils import format_relation_name, get_resource_type_from_instance, \`
`7`		`- get_resource_type_from_serializer, get_included_serializers`
	`6`	`+from rest_framework_json_api.utils import (`
	`7`	`+ get_resource_type_from_model, get_resource_type_from_instance,`
	`8`	`+ get_resource_type_from_serializer, get_included_serializers)`
`8`	`9`
`9`	`10`
`10`	`11`	`class ResourceIdentifierObjectSerializer(BaseSerializer):`
`@@ -24,7 +25,7 @@ def __init__(self, args, *kwargs):`
`24`	`25`
`25`	`26`	`def to_representation(self, instance):`
`26`	`27`	`return {`
`27`		`- 'type': format_relation_name(get_resource_type_from_instance(instance)),`
	`28`	`+ 'type': get_resource_type_from_instance(instance),`
`28`	`29`	`'id': str(instance.pk)`
`29`	`30`	`}`
`30`	`31`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`
`13`	`13`	`from rest_framework_json_api.exceptions import Conflict`
`14`	`14`	`from rest_framework_json_api.serializers import ResourceIdentifierObjectSerializer`
`15`		`-from rest_framework_json_api.utils import format_relation_name, get_resource_type_from_instance, OrderedDict, Hyperlink`
	`15`	`+from rest_framework_json_api.utils import get_resource_type_from_instance, OrderedDict, Hyperlink`
`16`	`16`
`17`	`17`
`18`	`18`	`class RelationshipView(generics.GenericAPIView):`
`@@ -154,7 +154,7 @@ def _instantiate_serializer(self, instance):`
`154`	`154`	`def get_resource_name(self):`
`155`	`155`	`if not hasattr(self, '_resource_name'):`
`156`	`156`	`instance = getattr(self.get_object(), self.kwargs['related_field'])`
`157`		`- self._resource_name = format_relation_name(get_resource_type_from_instance(instance))`
	`157`	`+ self._resource_name = get_resource_type_from_instance(instance)`
`158`	`158`	`return self._resource_name`
`159`	`159`
`160`	`160`	`def set_resource_name(self, value):`

Comments

(0)