Skip to content

'resource_instance' not needed when building resource object #86

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

Closed
wants to merge 1 commit into from
Closed

'resource_instance' not needed when building resource object #86

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
13 changes: 8 additions & 5 deletions rest_framework_json_api/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,12 +146,15 @@ def format_relation_name(value, format_type=None):
def build_json_resource_obj(fields, resource, resource_instance, resource_name):
resource_data = [
('type', resource_name),
('id', encoding.force_text(resource_instance.pk)),
('attributes', extract_attributes(fields, resource)),
]
relationships = extract_relationships(fields, resource, resource_instance)
if relationships:
resource_data.append(('relationships', relationships))
if resource_instance:
resource_data.append(('id', encoding.force_text(resource_instance.pk)))

resource_data.append(('attributes', extract_attributes(fields, resource)))
if resource_instance:
relationships = extract_relationships(fields, resource, resource_instance)
if relationships:
resource_data.append(('relationships', relationships))
# Add 'self' link if field is present and valid
if api_settings.URL_FIELD_NAME in resource and \
isinstance(fields[api_settings.URL_FIELD_NAME], RelatedField):
Expand Down