Commit ba5f46b

committed

Fix the inclusion of relations

When getting a list and including data from the models in the list, only the related data of the first model in the list was included

1 parent 279df07 commit ba5f46bCopy full SHA for ba5f46b

File tree

-6

lines changed

-6

lines changed

Lines changed: 5 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -413,14 +413,13 @@ def extract_included(fields, resource, resource_instance, included_resources):`
`413`	`413`	`if not isinstance(field, (RelatedField, ManyRelatedField, BaseSerializer)):`
`414`	`414`	`continue`
`415`	`415`
`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:`
	`416`	`+ if field_name not in included_resources:`
`422`	`417`	`# Skip fields not in requested included resources`
`423`	`418`	`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)`
`424`	`423`
`425`	`424`	`if isinstance(field, ManyRelatedField):`
`426`	`425`	`serializer_class = included_serializers.get(field_name)`

Comments

(0)