encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-07-23 22:49:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge a632e580e2 into 0fc5a49a11

Browse Source
This commit is contained in:
Mjumbe Poe 2012-09-07 12:12:59 -07:00
commit 631459ce6a
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
djangorestframework/mixins.py
View File

@ -181,7 +181,7 @@ class RequestMixin(object):
return parser.parse(stream)
raise ErrorResponse(status.HTTP_415_UNSUPPORTED_MEDIA_TYPE,
{'detail': 'Unsupported media type in request \'%s\'.' %
{'detail': 'Unsupported media type in request \'%s\'.' %
content_type})
@property
@ -514,8 +514,8 @@ class ModelMixin(object):
"""
Return the queryset for this view.
"""
return getattr(self.resource, 'queryset',
self.resource.model.objects.all())
return getattr(self._resource, 'queryset',
self._resource.model.objects.all())
def get_ordering(self):
"""

2
djangorestframework/tests/mixins.py
View File

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