Skip to content

Override media type + check relation.source to find relation type #52

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 3 commits into from
Aug 3, 2015
Merged

Override media type + check relation.source to find relation type #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e6bb75f
Override media_type in renderers.JSONRenderer as required by JSON API…
Aug 2, 2015
54cce05
Update utils.get_related_resource_type to check for relation.source b…
Aug 2, 2015
05eac28
utils.get_related_resource_type: remove check for relation.field_name
Aug 3, 2015
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
2 changes: 2 additions & 0 deletions rest_framework_json_api/renderers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ class JSONRenderer(renderers.JSONRenderer):
}
"""

media_type = 'application/vnd.api+json'

def render(self, data, accepted_media_type=None, renderer_context=None):
# Get the resource name.
resource_name = utils.get_resource_name(renderer_context)
Expand Down
2 changes: 1 addition & 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 @@ -151,7 +151,7 @@ def get_related_resource_type(relation):
parent_model = parent_serializer.parent.Meta.model
parent_model_relation = getattr(
parent_model,
(relation.field_name if relation.field_name else parent_serializer.field_name)
(relation.source if relation.source else parent_serializer.field_name)
)
if hasattr(parent_model_relation, 'related'):
relation_model = parent_model_relation.related.model
Expand Down