|
6 | 6 |
|
7 | 7 | from rest_framework_json_api.exceptions import Conflict |
8 | 8 | from rest_framework_json_api.utils import Hyperlink, \ |
9 | | - get_resource_type_from_queryset, get_resource_type_from_instance |
| 9 | + get_resource_type_from_queryset, get_resource_type_from_instance, \ |
| 10 | + get_included_serializers, get_resource_type_from_serializer |
10 | 11 |
|
11 | 12 |
|
12 | 13 | class ResourceRelatedField(PrimaryKeyRelatedField): |
@@ -137,7 +138,18 @@ def to_representation(self, value): |
137 | 138 | else: |
138 | 139 | pk = value.pk |
139 | 140 |
|
140 | | - return OrderedDict([('type', get_resource_type_from_instance(value)), ('id', str(pk))]) |
| 141 | + # check to see if this resource has a different resource_name when |
| 142 | + # included and use that name |
| 143 | + resource_type = None |
| 144 | + root = getattr(self.parent, 'parent', self.parent) |
| 145 | + field_name = self.field_name if self.field_name else self.parent.field_name |
| 146 | + if getattr(root, 'included_serializers', None) is not None: |
| 147 | + includes = get_included_serializers(root) |
| 148 | + if field_name in includes.keys(): |
| 149 | + resource_type = get_resource_type_from_serializer(includes[field_name]) |
| 150 | + |
| 151 | + resource_type = resource_type if resource_type else get_resource_type_from_instance(value) |
| 152 | + return OrderedDict([('type', resource_type), ('id', str(pk))]) |
141 | 153 |
|
142 | 154 | @property |
143 | 155 | def choices(self): |
|
0 commit comments