Commit 0c5e51a

committed

Merge pull request #128 from django-json-api/revert-127-develop

Revert "Fix the inclusion of relations"

2 parents 68b59e6 + 444feab commit 0c5e51aCopy full SHA for 0c5e51a

File tree

-5

lines changed

-5

lines changed

Lines changed: 6 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -413,13 +413,14 @@ def extract_included(fields, resource, resource_instance, included_resources):`
`413`	`413`	`if not isinstance(field, (RelatedField, ManyRelatedField, BaseSerializer)):`
`414`	`414`	`continue`
`415`	`415`
`416`		`- if field_name not in included_resources:`
	`416`	`+ try:`
	`417`	`+ included_resources.remove(field_name)`
	`418`	`+ new_included_resources = [key.replace('%s.' % field_name, '', 1) for key in included_resources]`
	`419`	`+ relation_instance_or_manager = getattr(resource_instance, field_name)`
	`420`	`+ serializer_data = resource.get(field_name)`
	`421`	`+ except ValueError:`
`417`	`422`	`# Skip fields not in requested included resources`
`418`	`423`	`continue`
`419`		`-`
`420`		`- new_included_resources = [key.replace('%s.' % field_name, '', 1) for key in included_resources]`
`421`		`- relation_instance_or_manager = getattr(resource_instance, field_name)`
`422`		`- serializer_data = resource.get(field_name)`
`423`	`424`
`424`	`425`	`if isinstance(field, ManyRelatedField):`
`425`	`426`	`serializer_class = included_serializers.get(field_name)`

Comments

(0)