Commit 450aa5c

SafaAlfulaijsliverc

and

authored

Allow get_serializer_class to be overwritten for related urls without defining serializer_class fallback (#904)

Co-authored-by: Oliver Sauder <os@esite.ch>

1 parent 51daed1 commit 450aa5cCopy full SHA for 450aa5c

File tree

+15

-14

lines changed

+15

-14

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,10 @@ any parts of the framework not mentioned in the documentation should generally b`
`14`	`14`
`15`	`15`	`* Added support for Django 3.2.`
`16`	`16`
	`17`	`+### Fixed`
	`18`	`+`
	`19`	+* Allow `get_serializer_class` to be overwritten when using related urls without defining `serializer_class` fallback
	`20`	`+`
`17`	`21`	`## [4.1.0] - 2021年03月08日`
`18`	`22`
`19`	`23`	`### Added`

Lines changed: 3 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -417,12 +417,11 @@ def test_get_related_serializer_class_many(self):`
`417`	`417`	`def test_get_serializer_comes_from_included_serializers(self):`
`418`	`418`	`kwargs = {"pk": self.author.id, "related_field": "type"}`
`419`	`419`	`view = self._get_view(kwargs)`
`420`		`- related_serializers = view.serializer_class.related_serializers`
`421`		`- delattr(view.serializer_class, "related_serializers")`
	`420`	`+ related_serializers = view.get_serializer_class().related_serializers`
	`421`	`+ delattr(view.get_serializer_class(), "related_serializers")`
`422`	`422`	`got = view.get_related_serializer_class()`
`423`	`423`	`self.assertEqual(got, AuthorTypeSerializer)`
`424`		`-`
`425`		`- view.serializer_class.related_serializers = related_serializers`
	`424`	`+ view.get_serializer_class().related_serializers = related_serializers`
`426`	`425`
`427`	`426`	`def test_get_related_serializer_class_raises_error(self):`
`428`	`427`	`kwargs = {"pk": self.author.id, "related_field": "unknown"}`

Lines changed: 7 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -208,17 +208,15 @@ class NoFiltersetEntryViewSet(EntryViewSet):`
`208`	`208`
`209`	`209`	`class AuthorViewSet(ModelViewSet):`
`210`	`210`	`queryset = Author.objects.all()`
`211`		`- serializer_classes = {`
`212`		`- "list": AuthorListSerializer,`
`213`		`- "retrieve": AuthorDetailSerializer,`
`214`		`- }`
`215`		`- serializer_class = AuthorSerializer # fallback`
`216`	`211`
`217`	`212`	`def get_serializer_class(self):`
`218`		`- try:`
`219`		`- return self.serializer_classes.get(self.action, self.serializer_class)`
`220`		`- except AttributeError:`
`221`		`- return self.serializer_class`
	`213`	`+ serializer_classes = {`
	`214`	`+ "list": AuthorListSerializer,`
	`215`	`+ "retrieve": AuthorDetailSerializer,`
	`216`	`+ }`
	`217`	`+`
	`218`	`+ action = getattr(self, "action", "")`
	`219`	`+ return serializer_classes.get(action, AuthorSerializer)`
`222`	`220`
`223`	`221`
`224`	`222`	`class CommentViewSet(ModelViewSet):`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ def get_related_serializer(self, instance, **kwargs):`
`154`	`154`	`return serializer_class(instance, **kwargs)`
`155`	`155`
`156`	`156`	`def get_related_serializer_class(self):`
`157`		`- parent_serializer_class = super(RelatedMixin, self).get_serializer_class()`
	`157`	`+ parent_serializer_class = self.get_serializer_class()`
`158`	`158`
`159`	`159`	`if "related_field" in self.kwargs:`
`160`	`160`	`field_name = self.kwargs["related_field"]`

Comments

(0)