encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-07-25 15:39:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge 231b30548b into 0fc5a49a11

Browse Source
This commit is contained in:
Sean Farley 2012-09-07 12:14:00 -07:00
commit 1240bac0fc
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
djangorestframework/mixins.py
View File

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