Commit 8316af2

committed

remove workaround per django-json-api#651

1 parent 40b657e commit 8316af2Copy full SHA for 8316af2

File tree

-12

lines changed

-12

lines changed

Lines changed: 1 addition & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -208,18 +208,7 @@ def get_queryset(self, args, *kwargs):`
`208`	`208`	`return super(CommentViewSet, self).get_queryset()`
`209`	`209`
`210`	`210`
`211`		`-class TestModelViewSet(PreloadIncludesMixin, RelatedMixin, viewsets.ModelViewSet):`
`212`		`- """`
`213`		`- TODO: this is a temporary workaround since AutoPreloadMixin and PreloadIncludesMixin`
`214`		`- conflict with each other for polymorphic viewsets.`
`215`		`- See https://github.com/django-json-api/django-rest-framework-json-api/pull/643`
`216`		`- DJA's views.ModelViewSet has both AutoPreloadMixin and PreloadIncludesMixin.`
`217`		`- """`
`218`		`- http_method_names = ['get', 'post', 'patch', 'delete', 'head', 'options']`
`219`		`-`
`220`		`-`
`221`		`-# class CompanyViewset(PreloadIncludesMixin, viewsets.ModelViewSet):`
`222`		`-class CompanyViewset(TestModelViewSet):`
	`211`	`+class CompanyViewset(ModelViewSet):`
`223`	`212`	`queryset = Company.objects.all()`
`224`	`213`	`serializer_class = CompanySerializer`
`225`	`214`

Comments

(0)