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

Merge bc29927f97 into e34e0536b1

Browse Source
This commit is contained in:
Vlad Dragos 2015-03-19 10:27:05 +00:00
commit 138c368107
1 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
rest_framework/pagination.py
View File

@ -6,6 +6,7 @@ be used for paginated responses.
from __future__ import unicode_literals from __future__ import unicode_literals
from base64 import b64encode, b64decode from base64 import b64encode, b64decode
from collections import namedtuple from collections import namedtuple
from django import VERSION as DJANGO_VERSION
from django.core.paginator import InvalidPage, Paginator as DjangoPaginator from django.core.paginator import InvalidPage, Paginator as DjangoPaginator
from django.template import Context, loader from django.template import Context, loader
from django.utils import six from django.utils import six
@ -512,10 +513,11 @@ class CursorPagination(BasePagination):
(offset, reverse, current_position) = self.cursor (offset, reverse, current_position) = self.cursor
# Cursor pagination always enforces an ordering. # Cursor pagination always enforces an ordering.
if reverse: if not queryset.ordered:
queryset = queryset.order_by(*_reverse_ordering(self.ordering)) if reverse:
else: queryset = queryset.order_by(*_reverse_ordering(self.ordering))
queryset = queryset.order_by(*self.ordering) else:
queryset = queryset.order_by(*self.ordering)
# If we have a cursor with a fixed position then filter by that. # If we have a cursor with a fixed position then filter by that.
if current_position is not None: if current_position is not None:
@ -681,6 +683,27 @@ class CursorPagination(BasePagination):
if hasattr(filter_cls, 'get_ordering') if hasattr(filter_cls, 'get_ordering')
] ]
if queryset.ordered:
if ordering_filters:
warnings.warn('The queryset is already ordered so'
'the ordering provided by the filter class {}'
'will be ignored'.format(filter_cls.__name__))
ordering = []
if queryset.query.extra_order_by:
ordering.extend(queryset.query.extra_order_by)
elif queryset.query.order_by:
ordering.extend(queryset.query.order_by)
elif queryset.query.default_ordering:
if DJANGO_VERSION[1] <= 5:
ordering.extend(queryset.query.model._meta.ordering)
else:
ordering.extend(queryset.query.get_meta().ordering)
# Since the queryset is ordered we return the existing ordering.
return ordering
if ordering_filters: if ordering_filters:
# If a filter exists on the view that implements `get_ordering` # If a filter exists on the view that implements `get_ordering`
# then we defer to that filter to determine the ordering. # then we defer to that filter to determine the ordering.
@ -710,6 +733,7 @@ class CursorPagination(BasePagination):
if isinstance(ordering, six.string_types): if isinstance(ordering, six.string_types):
return (ordering,) return (ordering,)
return tuple(ordering) return tuple(ordering)
def _get_position_from_instance(self, instance, ordering): def _get_position_from_instance(self, instance, ordering):