From 70e6594b3ca8937fc6117849e4fb17210ca4a781 Mon Sep 17 00:00:00 2001 From: SvartalF Date: Mon, 14 Jan 2013 12:21:54 +0900 Subject: [PATCH] Pass real queryset object to MultipleObjectMixin.paginate_queryset method --- rest_framework/generics.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/rest_framework/generics.py b/rest_framework/generics.py index 19f2b7047..f7ebfdd0b 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -102,6 +102,16 @@ class MultipleObjectAPIView(MultipleObjectMixin, GenericAPIView): pass return self.paginate_by + def paginate_queryset(self, queryset, page_size): + """ + Paginate queryset object, if filtering enabled, not a filter object. + """ + + if self.filter_backend: + queryset = queryset.qs + + return super(MultipleObjectAPIView, self).paginate_queryset(queryset, page_size) + class SingleObjectAPIView(SingleObjectMixin, GenericAPIView): """