Skip to content

Fix for inclusion of nested relations #142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 16, 2015
Merged

Fix for inclusion of nested relations #142

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Fix for inclusion of nested relations 
Closes #126
  • Loading branch information
@jsenecal
jsenecal committed Oct 16, 2015
commit bcdbbc44e4c742ca1635ff1c563117c13fcb4905
5 changes: 4 additions & 1 deletion rest_framework_json_api/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
HyperlinkedRouterField = type(None)

import django

if django.VERSION < (1, 7):
from django.utils.module_loading import import_by_path as import_class_from_dotted_path
else:
Expand Down Expand Up @@ -434,7 +435,9 @@ def extract_included(fields, resource, resource_instance, included_resources):
# For ManyRelatedFields if `related_name` is not set we need to access `foo_set` from `source`
relation_instance_or_manager = getattr(resource_instance, field.child_relation.source)

new_included_resources = [key.replace('%s.' % field_name, '', 1) for key in included_resources]
new_included_resources = [key.replace('%s.' % field_name, '', 1)
for key in included_resources
if field_name == key.split('.')[0]]
serializer_data = resource.get(field_name)

if isinstance(field, ManyRelatedField):
Expand Down