Commit 5cb9e21

committed

Don't break old tests

1 parent e0c6cc5 commit 5cb9e21Copy full SHA for 5cb9e21

File tree

+10

-6

lines changed

+10

-6

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`from rest_framework_json_api.relations import ResourceRelatedField`
`7`	`7`	`from rest_framework_json_api.utils import (`
`8`	`8`	`get_resource_type_from_model, get_resource_type_from_instance,`
`9`		`- get_resource_type_from_serializer, get_included_serializers)`
	`9`	`+ get_resource_type_from_serializer, get_included_serializers, get_included_resources)`
`10`	`10`
`11`	`11`
`12`	`12`	`class ResourceIdentifierObjectSerializer(BaseSerializer):`
`@@ -90,7 +90,7 @@ def validate_path(serializer_class, field_path, path):`
`90`	`90`	`validate_path(this_included_serializer, new_included_field_path, path)`
`91`	`91`
`92`	`92`	`if request and view:`
`93`		`- included_resources = utils.get_included_resources(request)`
	`93`	`+ included_resources = get_included_resources(request)`
`94`	`94`	`for included_field_name in included_resources:`
`95`	`95`	`included_field_path = included_field_name.split('.')`
`96`	`96`	`this_serializer_class = view.get_serializer_class()`

Lines changed: 8 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -241,10 +241,14 @@ def get_included_resources(request, serializer=None):`
`241`	`241`	`if include_resources_param:`
`242`	`242`	`return include_resources_param.split(',')`
`243`	`243`	`else:`
`244`		`- try:`
`245`		`- return list(serializer.JSONAPIMeta.included_resources)`
`246`		`- except AttributeError:`
`247`		`- return []`
	`244`	`+ return get_default_included_resources_from_serializer(serializer)`
	`245`	`+`
	`246`	`+`
	`247`	`+def get_default_included_resources_from_serializer(serializer):`
	`248`	`+ try:`
	`249`	`+ return list(serializer.JSONAPIMeta.included_resources)`
	`250`	`+ except AttributeError:`
	`251`	`+ return []`
`248`	`252`
`249`	`253`
`250`	`254`	`def get_included_serializers(serializer):`

Comments

(0)