diff --git a/djangorestframework/mixins.py b/djangorestframework/mixins.py index 4a4539574..d910e0c93 100644 --- a/djangorestframework/mixins.py +++ b/djangorestframework/mixins.py @@ -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): """ diff --git a/djangorestframework/tests/mixins.py b/djangorestframework/tests/mixins.py index 8268fdca7..d83692553 100644 --- a/djangorestframework/tests/mixins.py +++ b/djangorestframework/tests/mixins.py @@ -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)