encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-08 06:14:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge 1b7351763c into ffdac0d936

Browse Source
This commit is contained in:
Nicholas Horelik 2016-05-05 18:37:57 +00:00
commit 98737ad762
2 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
rest_framework/pagination.py
View File

@ -334,39 +334,43 @@ class LimitOffsetPagination(BasePagination):
return 0 return 0
def get_next_link(self): def get_next_link(self):
if self.offset + self.limit >= self.count: limit = self.limit if self.limit > 0 else self.default_limit
if self.offset + limit >= self.count:
return None return None
url = self.request.build_absolute_uri() url = self.request.build_absolute_uri()
url = replace_query_param(url, self.limit_query_param, self.limit) url = replace_query_param(url, self.limit_query_param, limit)
offset = self.offset + self.limit offset = self.offset + limit
return replace_query_param(url, self.offset_query_param, offset) return replace_query_param(url, self.offset_query_param, offset)
def get_previous_link(self): def get_previous_link(self):
limit = self.limit if self.limit > 0 else self.default_limit
if self.offset <= 0: if self.offset <= 0:
return None return None
url = self.request.build_absolute_uri() url = self.request.build_absolute_uri()
url = replace_query_param(url, self.limit_query_param, self.limit) url = replace_query_param(url, self.limit_query_param, limit)
if self.offset - self.limit <= 0: if self.offset - limit <= 0:
return remove_query_param(url, self.offset_query_param) return remove_query_param(url, self.offset_query_param)
offset = self.offset - self.limit offset = self.offset - limit
return replace_query_param(url, self.offset_query_param, offset) return replace_query_param(url, self.offset_query_param, offset)
def get_html_context(self): def get_html_context(self):
base_url = self.request.build_absolute_uri() base_url = self.request.build_absolute_uri()
current = _divide_with_ceil(self.offset, self.limit) + 1 limit = self.limit if self.limit > 0 else self.default_limit
base_url = replace_query_param(base_url, self.limit_query_param, limit)
current = _divide_with_ceil(self.offset, limit) + 1
# The number of pages is a little bit fiddly. # The number of pages is a little bit fiddly.
# We need to sum both the number of pages from current offset to end # We need to sum both the number of pages from current offset to end
# plus the number of pages up to the current offset. # plus the number of pages up to the current offset.
# When offset is not strictly divisible by the limit then we may # When offset is not strictly divisible by the limit then we may
# end up introducing an extra page as an artifact. # end up introducing an extra page as an artifact.
final = ( final = (
_divide_with_ceil(self.count - self.offset, self.limit) + _divide_with_ceil(self.count - self.offset, limit) +
_divide_with_ceil(self.offset, self.limit) _divide_with_ceil(self.offset, limit)
) )
if final < 1: if final < 1:
final = 1 final = 1
@ -378,7 +382,7 @@ class LimitOffsetPagination(BasePagination):
if page_number == 1: if page_number == 1:
return remove_query_param(base_url, self.offset_query_param) return remove_query_param(base_url, self.offset_query_param)
else: else:
offset = self.offset + ((page_number - current) * self.limit) offset = self.offset + ((page_number - current) * limit)
return replace_query_param(base_url, self.offset_query_param, offset) return replace_query_param(base_url, self.offset_query_param, offset)
page_numbers = _get_displayed_page_numbers(current, final) page_numbers = _get_displayed_page_numbers(current, final)

17
tests/test_pagination.py
View File

@ -505,6 +505,23 @@ class TestLimitOffset:
assert content.get('next') == next_url assert content.get('next') == next_url
assert content.get('previous') == prev_url assert content.get('previous') == prev_url
def test_limit_is_zero(self):
"""
A limit of zero should produce an empty queryset without Exceptions and
otherwise favor the defaults.
"""
request = Request(factory.get('/', {'limit': '0', 'offset': 0}))
queryset = self.paginate_queryset(request)
content = self.get_paginated_content(queryset)
context = self.get_html_context()
next_limit = self.pagination.default_limit
next_offset = self.pagination.default_limit
next_url = 'http://testserver/?limit={0}&offset={1}'.format(next_limit, next_offset)
assert queryset == []
assert content.get('next') == next_url
assert context.get('page_links')[0] == \
PageLink('http://testserver/?limit={0}'.format(next_limit), 1, True, False)
class TestCursorPagination: class TestCursorPagination:
""" """