Skip to content

Fixed get_resource_name in case of non-model backed serializer. #221

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 1 commit into from
Apr 8, 2016
Merged

Fixed get_resource_name in case of non-model backed serializer. #221

Show file tree
Hide file tree
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
10 changes: 10 additions & 0 deletions example/tests/unit/test_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@
pytestmark = pytest.mark.django_db


class NonModelResourceSerializer(serializers.Serializer):
class Meta:
resource_name = 'users'


class ResourceSerializer(serializers.ModelSerializer):
class Meta:
fields = ('username',)
Expand Down Expand Up @@ -51,6 +56,11 @@ def test_get_resource_name():
view.serializer_class.Meta.resource_name = 'rcustom'
assert 'rcustom' == utils.get_resource_name(context), 'set on serializer'

view = GenericAPIView()
view.serializer_class = NonModelResourceSerializer
context = {'view': view}
assert 'users' == utils.get_resource_name(context), 'derived from non-model serializer'


def test_format_keys():
underscored = {
Expand Down
8 changes: 4 additions & 4 deletions rest_framework_json_api/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,10 +214,10 @@ def get_resource_type_from_manager(manager):


def get_resource_type_from_serializer(serializer):
return getattr(
serializer.Meta,
'resource_name',
get_resource_type_from_model(serializer.Meta.model))
if hasattr(serializer.Meta, 'resource_name'):
return serializer.Meta.resource_name
else:
return get_resource_type_from_model(serializer.Meta.model)


def get_included_serializers(serializer):
Expand Down