Commit d08e9f3

committed

Merge pull request #221 from scottfisk/fix-219

Fixed get_resource_name in case of non-model backed serializer.

2 parents 8f105c5 + 21823ec commit d08e9f3Copy full SHA for d08e9f3

File tree

+14

-4

lines changed

+14

-4

lines changed

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,11 @@`
`15`	`15`	`pytestmark = pytest.mark.django_db`
`16`	`16`
`17`	`17`
	`18`	`+class NonModelResourceSerializer(serializers.Serializer):`
	`19`	`+ class Meta:`
	`20`	`+ resource_name = 'users'`
	`21`	`+`
	`22`	`+`
`18`	`23`	`class ResourceSerializer(serializers.ModelSerializer):`
`19`	`24`	`class Meta:`
`20`	`25`	`fields = ('username',)`
`@@ -51,6 +56,11 @@ def test_get_resource_name():`
`51`	`56`	`view.serializer_class.Meta.resource_name = 'rcustom'`
`52`	`57`	`assert 'rcustom' == utils.get_resource_name(context), 'set on serializer'`
`53`	`58`
	`59`	`+ view = GenericAPIView()`
	`60`	`+ view.serializer_class = NonModelResourceSerializer`
	`61`	`+ context = {'view': view}`
	`62`	`+ assert 'users' == utils.get_resource_name(context), 'derived from non-model serializer'`
	`63`	`+`
`54`	`64`
`55`	`65`	`def test_format_keys():`
`56`	`66`	`underscored = {`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -214,10 +214,10 @@ def get_resource_type_from_manager(manager):`
`214`	`214`
`215`	`215`
`216`	`216`	`def get_resource_type_from_serializer(serializer):`
`217`		`- returngetattr(`
`218`		`- serializer.Meta,`
`219`		`- 'resource_name',`
`220`		`- get_resource_type_from_model(serializer.Meta.model))`
	`217`	`+ ifhasattr(serializer.Meta, 'resource_name'):`
	`218`	`+ returnserializer.Meta.resource_name`
	`219`	`+ else:`
	`220`	`+ returnget_resource_type_from_model(serializer.Meta.model)`
`221`	`221`
`222`	`222`
`223`	`223`	`def get_included_serializers(serializer):`

Comments

(0)