Merge pull request #4437 from dfavato/master

Set self.count before self.limit in LimitOffsetPagination
This commit is contained in:
Tom Christie 2017-05-02 10:21:36 +01:00 committed by GitHub
commit 60dbe72a62

View File

@ -332,12 +332,12 @@ class LimitOffsetPagination(BasePagination):
template = 'rest_framework/pagination/numbers.html' template = 'rest_framework/pagination/numbers.html'
def paginate_queryset(self, queryset, request, view=None): def paginate_queryset(self, queryset, request, view=None):
self.count = _get_count(queryset)
self.limit = self.get_limit(request) self.limit = self.get_limit(request)
if self.limit is None: if self.limit is None:
return None return None
self.offset = self.get_offset(request) self.offset = self.get_offset(request)
self.count = _get_count(queryset)
self.request = request self.request = request
if self.count > self.limit and self.template is not None: if self.count > self.limit and self.template is not None:
self.display_page_controls = True self.display_page_controls = True