aboutsummaryrefslogtreecommitdiffstats
path: root/djangorestframework/mixins.py
diff options
context:
space:
mode:
authorTom Christie2012-01-19 10:53:00 -0800
committerTom Christie2012-01-19 10:53:00 -0800
commitdafda87a5c38158a2222ba0faccea1adac6da1ac (patch)
treeb892cc80b81f02ed6279a1db30d4869f2d48a944 /djangorestframework/mixins.py
parent0a5ca000edcd8fba1e5e5f71c7267d9f52e456a0 (diff)
parent338e77837c9df6f36c77db67a65a3a485b1064a4 (diff)
downloaddjango-rest-framework-dafda87a5c38158a2222ba0faccea1adac6da1ac.tar.bz2
Merge pull request #135 from bunchesofdonald/master
Add get_queryset method to ListModelMixin.
Diffstat (limited to 'djangorestframework/mixins.py')
-rw-r--r--djangorestframework/mixins.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/djangorestframework/mixins.py b/djangorestframework/mixins.py
index 15d7faf0..c7f7b10c 100644
--- a/djangorestframework/mixins.py
+++ b/djangorestframework/mixins.py
@@ -675,9 +675,7 @@ class ListModelMixin(ModelMixin):
queryset = None
def get(self, request, *args, **kwargs):
- model = self.resource.model
-
- queryset = self.queryset if self.queryset is not None else model.objects.all()
+ queryset = self.get_queryset()
if hasattr(self, 'resource'):
ordering = getattr(self.resource, 'ordering', None)
@@ -689,6 +687,10 @@ class ListModelMixin(ModelMixin):
queryset = queryset.order_by(*args)
return queryset.filter(self.build_query(**kwargs))
+ def get_queryset(self):
+ model = self.resource.model
+ return model.objects.all() if self.queryset is None else self.queryset
+
########## Pagination Mixins ##########