Skip to content

ResourceRelatedField edited to work with plural names #167

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

ResourceRelatedField edited to work with plural names #167

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
11 changes: 7 additions & 4 deletions rest_framework_json_api/relations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ class ResourceRelatedField(PrimaryKeyRelatedField):
self_link_view_name = None
related_link_view_name = None
related_link_lookup_field = 'pk'
related_resource_name = None

default_error_messages = {
'required': _('This field is required.'),
Expand All @@ -22,11 +23,13 @@ class ResourceRelatedField(PrimaryKeyRelatedField):
'no_match': _('Invalid hyperlink - No URL match.'),
}

def __init__(self, self_link_view_name=None, related_link_view_name=None, **kwargs):
def __init__(self, self_link_view_name=None, related_link_view_name=None, related_resource_name=None, **kwargs):
if self_link_view_name is not None:
self.self_link_view_name = self_link_view_name
if related_link_view_name is not None:
self.related_link_view_name = related_link_view_name
if related_resource_name is not None:
self.related_resource_name = related_resource_name

self.related_link_lookup_field = kwargs.pop('related_link_lookup_field', self.related_link_lookup_field)
self.related_link_url_kwarg = kwargs.pop('related_link_url_kwarg', self.related_link_lookup_field)
Expand Down Expand Up @@ -116,7 +119,7 @@ def to_internal_value(self, data):
self.fail('incorrect_type', data_type=type(data).__name__)
if not isinstance(data, dict):
self.fail('incorrect_type', data_type=type(data).__name__)
expected_relation_type = get_resource_type_from_queryset(self.queryset)
expected_relation_type = self.related_resource_name or get_resource_type_from_queryset(self.queryset)
if data['type'] != expected_relation_type:
self.conflict('incorrect_relation_type', relation_type=expected_relation_type, received_type=data['type'])
return super(ResourceRelatedField, self).to_internal_value(data['id'])
Expand All @@ -139,8 +142,8 @@ def choices(self):

return OrderedDict([
(
json.dumps(self.to_representation(item)),
self.display_value(item)
str(item.pk),
str(item)
)
for item in queryset
])
Expand Down