From 484adc28ec5b4136ff2327bc19202af7656c7198 Mon Sep 17 00:00:00 2001 From: Christian Zosel Date: Thu, 1 Dec 2016 10:08:14 +0100 Subject: [PATCH 1/2] Fix resource_name support for ResourceRelatedField --- rest_framework_json_api/relations.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework_json_api/relations.py b/rest_framework_json_api/relations.py index b4eefc45..697f8298 100644 --- a/rest_framework_json_api/relations.py +++ b/rest_framework_json_api/relations.py @@ -145,7 +145,7 @@ def to_representation(self, value): # check to see if this resource has a different resource_name when # included and use that name resource_type = None - root = getattr(self.parent, 'parent', self.parent) + root = getattr(self.parent, 'parent', self.parent) or self.parent field_name = self.field_name if self.field_name else self.parent.field_name if getattr(root, 'included_serializers', None) is not None: includes = get_included_serializers(root) From 0700202d2f525709015ceecb22240072806a49e8 Mon Sep 17 00:00:00 2001 From: Christian Zosel Date: Fri, 2 Dec 2016 13:26:33 +0100 Subject: [PATCH 2/2] Revert "Fix resource_name support for ResourceRelatedField" This reverts commit 484adc28ec5b4136ff2327bc19202af7656c7198. --- rest_framework_json_api/relations.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework_json_api/relations.py b/rest_framework_json_api/relations.py index 697f8298..b4eefc45 100644 --- a/rest_framework_json_api/relations.py +++ b/rest_framework_json_api/relations.py @@ -145,7 +145,7 @@ def to_representation(self, value): # check to see if this resource has a different resource_name when # included and use that name resource_type = None - root = getattr(self.parent, 'parent', self.parent) or self.parent + root = getattr(self.parent, 'parent', self.parent) field_name = self.field_name if self.field_name else self.parent.field_name if getattr(root, 'included_serializers', None) is not None: includes = get_included_serializers(root)