Skip to content

Fix .all() call on instance objects instead of only manager objects #102

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
Sep 22, 2015
Merged

Fix .all() call on instance objects instead of only manager objects #102

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
4 changes: 2 additions & 2 deletions rest_framework_json_api/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,13 +336,13 @@ def extract_included(fields, resource, resource_instance):
continue

relation_instance_or_manager = getattr(resource_instance, field_name)
relation_queryset = relation_instance_or_manager.all()
serializer_data = resource.get(field_name)

if isinstance(field, ListSerializer):
serializer = field.child
model = serializer.Meta.model
relation_type = format_relation_name(model.__name__)
relation_queryset = relation_instance_or_manager.all()

# Get the serializer fields
serializer_fields = get_serializer_fields(serializer)
Expand All @@ -364,7 +364,7 @@ def extract_included(fields, resource, resource_instance):
serializer_fields = get_serializer_fields(field)
if serializer_data:
included_data.append(
build_json_resource_obj(serializer_fields, serializer_data, relation_queryset, relation_type)
build_json_resource_obj(serializer_fields, serializer_data, relation_instance_or_manager, relation_type)
)

return format_keys(included_data)