Merge pull request #135 from bunchesofdonald/master

Add get_queryset method to ListModelMixin.
This commit is contained in:
Tom Christie 2012-01-19 10:53:00 -08:00
commit dafda87a5c

View File

@ -675,9 +675,7 @@ class ListModelMixin(ModelMixin):
queryset = None queryset = None
def get(self, request, *args, **kwargs): def get(self, request, *args, **kwargs):
model = self.resource.model queryset = self.get_queryset()
queryset = self.queryset if self.queryset is not None else model.objects.all()
if hasattr(self, 'resource'): if hasattr(self, 'resource'):
ordering = getattr(self.resource, 'ordering', None) ordering = getattr(self.resource, 'ordering', None)
@ -689,6 +687,10 @@ class ListModelMixin(ModelMixin):
queryset = queryset.order_by(*args) queryset = queryset.order_by(*args)
return queryset.filter(self.build_query(**kwargs)) 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 ########## ########## Pagination Mixins ##########