Skip to content

Commit 5cb9e21

Browse files
committed
Don't break old tests
1 parent e0c6cc5 commit 5cb9e21

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

rest_framework_json_api/serializers.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from rest_framework_json_api.relations import ResourceRelatedField
77
from rest_framework_json_api.utils import (
88
get_resource_type_from_model, get_resource_type_from_instance,
9-
get_resource_type_from_serializer, get_included_serializers)
9+
get_resource_type_from_serializer, get_included_serializers, get_included_resources)
1010

1111

1212
class ResourceIdentifierObjectSerializer(BaseSerializer):
@@ -90,7 +90,7 @@ def validate_path(serializer_class, field_path, path):
9090
validate_path(this_included_serializer, new_included_field_path, path)
9191

9292
if request and view:
93-
included_resources = utils.get_included_resources(request)
93+
included_resources = get_included_resources(request)
9494
for included_field_name in included_resources:
9595
included_field_path = included_field_name.split('.')
9696
this_serializer_class = view.get_serializer_class()

rest_framework_json_api/utils.py

+8-4
Original file line numberDiff line numberDiff line change
@@ -241,10 +241,14 @@ def get_included_resources(request, serializer=None):
241241
if include_resources_param:
242242
return include_resources_param.split(',')
243243
else:
244-
try:
245-
return list(serializer.JSONAPIMeta.included_resources)
246-
except AttributeError:
247-
return []
244+
return get_default_included_resources_from_serializer(serializer)
245+
246+
247+
def get_default_included_resources_from_serializer(serializer):
248+
try:
249+
return list(serializer.JSONAPIMeta.included_resources)
250+
except AttributeError:
251+
return []
248252

249253

250254
def get_included_serializers(serializer):

0 commit comments

Comments
 (0)