encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-25 19:14:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

allow cursor format customization

Browse Source
This commit is contained in:
homm 2015-06-12 19:21:57 +03:00
parent e4b0273f76
commit ab03729b58
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
rest_framework/pagination.py
View File

@ -503,15 +503,10 @@ class CursorPagination(BasePagination):
self.base_url = request.build_absolute_uri() self.base_url = request.build_absolute_uri()
self.ordering = self.get_ordering(request, queryset, view) self.ordering = self.get_ordering(request, queryset, view)
# Determine if we have a cursor, and if so then decode it. self.cursor = self.decode_cursor(request)
encoded = request.query_params.get(self.cursor_query_param) if self.cursor is None:
if encoded is None:
self.cursor = None
(offset, reverse, current_position) = (0, False, None) (offset, reverse, current_position) = (0, False, None)
else: else:
self.cursor = _decode_cursor(encoded)
if self.cursor is None:
raise NotFound(self.invalid_cursor_message)
(offset, reverse, current_position) = self.cursor (offset, reverse, current_position) = self.cursor
# Cursor pagination always enforces an ordering. # Cursor pagination always enforces an ordering.
@ -623,8 +618,7 @@ class CursorPagination(BasePagination):
position = self.previous_position position = self.previous_position
cursor = Cursor(offset=offset, reverse=False, position=position) cursor = Cursor(offset=offset, reverse=False, position=position)
encoded = _encode_cursor(cursor) return self.encode_cursor(cursor)
return replace_query_param(self.base_url, self.cursor_query_param, encoded)
def get_previous_link(self): def get_previous_link(self):
if not self.has_previous: if not self.has_previous:
@ -672,8 +666,7 @@ class CursorPagination(BasePagination):
position = self.next_position position = self.next_position
cursor = Cursor(offset=offset, reverse=True, position=position) cursor = Cursor(offset=offset, reverse=True, position=position)
encoded = _encode_cursor(cursor) return self.encode_cursor(cursor)
return replace_query_param(self.base_url, self.cursor_query_param, encoded)
def get_ordering(self, request, queryset, view): def get_ordering(self, request, queryset, view):
""" """
@ -715,6 +708,19 @@ class CursorPagination(BasePagination):
return (ordering,) return (ordering,)
return tuple(ordering) return tuple(ordering)
def decode_cursor(self, request):
# Determine if we have a cursor, and if so then decode it.
encoded = request.query_params.get(self.cursor_query_param)
if encoded is not None:
cursor = _decode_cursor(encoded)
if cursor is None:
raise NotFound(self.invalid_cursor_message)
return cursor
def encode_cursor(self, cursor):
encoded = _encode_cursor(cursor)
return replace_query_param(self.base_url, self.cursor_query_param, encoded)
def _get_position_from_instance(self, instance, ordering): def _get_position_from_instance(self, instance, ordering):
attr = getattr(instance, ordering[0].lstrip('-')) attr = getattr(instance, ordering[0].lstrip('-'))
return six.text_type(attr) return six.text_type(attr)