encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-28 12:34:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use a resource instance instead of a class to get the queryset

Browse Source
This commit is contained in:
Mjumbe Wawatu Poe 2012-08-29 17:58:44 -04:00
parent baab2f059f
commit a632e580e2
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
djangorestframework/mixins.py
View File

@ -514,8 +514,8 @@ class ModelMixin(object):
""" """
Return the queryset for this view. Return the queryset for this view.
""" """
return getattr(self.resource, 'queryset', return getattr(self._resource, 'queryset',
self.resource.model.objects.all()) self._resource.model.objects.all())
def get_ordering(self): def get_ordering(self):
""" """

2
djangorestframework/tests/mixins.py
View File

@ -29,6 +29,7 @@ class TestModelRead(TestModelsTestCase):
request = self.req.get('/groups') request = self.req.get('/groups')
mixin = ReadModelMixin() mixin = ReadModelMixin()
mixin.resource = GroupResource mixin.resource = GroupResource
mixin._resource = GroupResource(mixin)
response = mixin.get(request, id=group.id) response = mixin.get(request, id=group.id)
self.assertEquals(group.name, response.name) self.assertEquals(group.name, response.name)
@ -40,6 +41,7 @@ class TestModelRead(TestModelsTestCase):
request = self.req.get('/groups') request = self.req.get('/groups')
mixin = ReadModelMixin() mixin = ReadModelMixin()
mixin.resource = GroupResource mixin.resource = GroupResource
mixin._resource = GroupResource(mixin)
self.assertRaises(ErrorResponse, mixin.get, request, id=12345) self.assertRaises(ErrorResponse, mixin.get, request, id=12345)