diff options
| author | Tom Christie | 2012-11-07 20:13:27 +0000 |
|---|---|---|
| committer | Tom Christie | 2012-11-07 20:13:27 +0000 |
| commit | 9fd061a0b68f0cef6683bf195911a2cc7ff2fa06 (patch) | |
| tree | 60769e37be41acf4bf12ba4ad59737e57c55da6a /rest_framework/mixins.py | |
| parent | 066d51faa16d1cfd3c8370c6bfe46f8494bbc26a (diff) | |
| parent | 09f39bd23b3c688c89551845d665395e1aabbfab (diff) | |
| download | django-rest-framework-9fd061a0b68f0cef6683bf195911a2cc7ff2fa06.tar.bz2 | |
Merge branch 'restframework2-filter' of git://github.com/onepercentclub/django-rest-framework into filtering
Diffstat (limited to 'rest_framework/mixins.py')
| -rw-r--r-- | rest_framework/mixins.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rest_framework/mixins.py b/rest_framework/mixins.py index 6824a4d2..c3625a88 100644 --- a/rest_framework/mixins.py +++ b/rest_framework/mixins.py @@ -34,7 +34,7 @@ class ListModelMixin(object): empty_error = u"Empty list and '%(class_name)s.allow_empty' is False." def list(self, request, *args, **kwargs): - self.object_list = self.get_queryset() + self.object_list = self.get_filtered_queryset() # Default is to allow empty querysets. This can be altered by setting # `.allow_empty = False`, to raise 404 errors on empty querysets. |