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 e84325b3fb into 8f6173cd8a

Browse Source
This commit is contained in:
Dmitrij Strelnikov 2017-04-24 15:06:44 +00:00 committed by GitHub
commit bc36698015
1 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
rest_framework/pagination.py
View File

@ -568,7 +568,7 @@ class CursorPagination(BasePagination):
def get_page_size(self, request): def get_page_size(self, request):
return self.page_size return self.page_size
def get_next_link(self): def get_next_cursor(self):
if not self.has_next: if not self.has_next:
return None return None
@ -613,10 +613,18 @@ class CursorPagination(BasePagination):
offset = self.cursor.offset + self.page_size offset = self.cursor.offset + self.page_size
position = self.previous_position position = self.previous_position
cursor = Cursor(offset=offset, reverse=False, position=position) return Cursor(offset=offset, reverse=False, position=position)
return self.encode_cursor(cursor)
def get_previous_link(self): def get_next_encoded_cursor(self):
return self.encode_cursor(self.get_next_cursor())
def get_next_link(self):
if not self.has_next:
return None
return self.urify_cursor(self.get_next_encoded_cursor())
def get_previous_cursor(self):
if not self.has_previous: if not self.has_previous:
return None return None
@ -661,8 +669,16 @@ class CursorPagination(BasePagination):
offset = 0 offset = 0
position = self.next_position position = self.next_position
cursor = Cursor(offset=offset, reverse=True, position=position) return Cursor(offset=offset, reverse=True, position=position)
return self.encode_cursor(cursor)
def get_previous_encoded_cursor(self):
return self.encode_cursor(self.get_previous_cursor())
def get_previous_link(self):
if not self.has_previous:
return None
return self.urify_cursor(self.get_previous_encoded_cursor())
def get_ordering(self, request, queryset, view): def get_ordering(self, request, queryset, view):
""" """
@ -738,6 +754,9 @@ class CursorPagination(BasePagination):
""" """
Given a Cursor instance, return an url with encoded cursor. Given a Cursor instance, return an url with encoded cursor.
""" """
if cursor is None:
return None
tokens = {} tokens = {}
if cursor.offset != 0: if cursor.offset != 0:
tokens['o'] = str(cursor.offset) tokens['o'] = str(cursor.offset)
@ -747,8 +766,10 @@ class CursorPagination(BasePagination):
tokens['p'] = cursor.position tokens['p'] = cursor.position
querystring = urlparse.urlencode(tokens, doseq=True) querystring = urlparse.urlencode(tokens, doseq=True)
encoded = b64encode(querystring.encode('ascii')).decode('ascii') return b64encode(querystring.encode('ascii')).decode('ascii')
return replace_query_param(self.base_url, self.cursor_query_param, encoded)
def urify_cursor(self, encoded_cursor):
return replace_query_param(self.base_url, self.cursor_query_param, encoded_cursor)
def _get_position_from_instance(self, instance, ordering): def _get_position_from_instance(self, instance, ordering):
field_name = ordering[0].lstrip('-') field_name = ordering[0].lstrip('-')