Skip to content

Check resource name on included serializer in to_internal_value #306

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 10 commits into from
May 10, 2017
Merged

Check resource name on included serializer in to_internal_value #306

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
484adc2
Fix resource_name support for ResourceRelatedField
czosel Dec 1, 2016
1c8d835
Check resource name on included serializer in to_internal_value
czosel Dec 1, 2016
0700202
Revert "Fix resource_name support for ResourceRelatedField"
czosel Dec 2, 2016
76caa82
Improve identification of root serializer
czosel Dec 2, 2016
4053901
Add tests for resource_name support
czosel Dec 5, 2016
b0f0ed1
Fix field_name support in to_internal_value
czosel Dec 13, 2016
1001fa5
Refactor tests to use pytest monkeypatch
czosel Dec 14, 2016
50ff418
Merge branch 'develop' into bug_relations_to_internal_value
czosel May 10, 2017
f454894
Merge remote-tracking branch 'upstream/develop' into bug_relations_to…
czosel May 10, 2017
fec7e0a
Minor refactoring based on feedback
czosel May 10, 2017
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
Prev Previous commit
Next Next commit
Fix field_name support in to_internal_value
  • Loading branch information
@czosel
czosel committed Dec 13, 2016
commit b0f0ed10f0c75d42648c70406bc29dd02e5e7596
9 changes: 4 additions & 5 deletions rest_framework_json_api/relations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ def to_internal_value(self, data):
self.fail('incorrect_type', data_type=type(data).__name__)

expected_relation_type = get_resource_type_from_queryset(self.queryset)
serializer_resource_type = self.get_resource_type_from_included_serializer(expected_relation_type)
serializer_resource_type = self.get_resource_type_from_included_serializer()

if serializer_resource_type is not None:
expected_relation_type = serializer_resource_type
Expand All @@ -148,19 +148,18 @@ def to_representation(self, value):
else:
pk = value.pk

field_name = self.field_name if self.field_name else self.parent.field_name

resource_type = self.get_resource_type_from_included_serializer(field_name)
resource_type = self.get_resource_type_from_included_serializer()
if resource_type is None:
resource_type = get_resource_type_from_instance(value)

return OrderedDict([('type', resource_type), ('id', str(pk))])

def get_resource_type_from_included_serializer(self, field_name):
def get_resource_type_from_included_serializer(self):
"""
Check to see it this resource has a different resource_name when
included and return that name, or None
"""
field_name = self.field_name or self.parent.field_name
root = self.get_root_serializer()

if root is not None:
Expand Down