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

Merge f91d332c6c into 003c304115

Browse Source
This commit is contained in:
Alexander Karpinsky 2017-05-16 10:36:40 +00:00 committed by GitHub
commit d4df1b8094
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rest_framework/pagination.py
View File

@ -572,7 +572,7 @@ class CursorPagination(BasePagination):
if not self.has_next: if not self.has_next:
return None return None
if self.cursor and self.cursor.reverse and self.cursor.offset != 0: if self.cursor and self.cursor.reverse and self.cursor.offset != 0 and self.page:
# If we're reversing direction and we have an offset cursor # If we're reversing direction and we have an offset cursor
# then we cannot use the first position we find as a marker. # then we cannot use the first position we find as a marker.
compare = self._get_position_from_instance(self.page[-1], self.ordering) compare = self._get_position_from_instance(self.page[-1], self.ordering)
@ -620,7 +620,7 @@ class CursorPagination(BasePagination):
if not self.has_previous: if not self.has_previous:
return None return None
if self.cursor and not self.cursor.reverse and self.cursor.offset != 0: if self.cursor and not self.cursor.reverse and self.cursor.offset != 0 and self.page:
# If we're reversing direction and we have an offset cursor # If we're reversing direction and we have an offset cursor
# then we cannot use the first position we find as a marker. # then we cannot use the first position we find as a marker.
compare = self._get_position_from_instance(self.page[0], self.ordering) compare = self._get_position_from_instance(self.page[0], self.ordering)

12
tests/test_pagination.py
View File

@ -9,7 +9,7 @@ from django.test import TestCase
from rest_framework import ( from rest_framework import (
exceptions, filters, generics, pagination, serializers, status exceptions, filters, generics, pagination, serializers, status
) )
from rest_framework.pagination import PAGE_BREAK, PageLink from rest_framework.pagination import PAGE_BREAK, PageLink, Cursor
from rest_framework.request import Request from rest_framework.request import Request
from rest_framework.test import APIRequestFactory from rest_framework.test import APIRequestFactory
@ -633,6 +633,16 @@ class CursorPaginationTestsMixin:
assert isinstance(self.pagination.to_html(), type('')) assert isinstance(self.pagination.to_html(), type(''))
def test_offset_cutoff(self):
(previous, current, next, previous_url, next_url) = self.get_pages('/')
next_url = self.pagination.encode_cursor(Cursor(1050, False, None))
(previous, current, next, previous_url, next_url) = self.get_pages(next_url)
assert previous == [7, 7, 7, 8, 9]
assert current == []
assert next is None
class TestCursorPagination(CursorPaginationTestsMixin): class TestCursorPagination(CursorPaginationTestsMixin):
""" """