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

Merge b3b74b0dfe into 836e49b535

Browse Source
This commit is contained in:
freyley 2017-06-06 03:13:19 +00:00 committed by GitHub
commit 25d461cc77
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rest_framework/generics.py
View File

@ -172,12 +172,12 @@ class GenericAPIView(views.APIView):
return None
return self.paginator.paginate_queryset(queryset, self.request, view=self)
def get_paginated_response(self, data):
def get_paginated_response(self, data, queryset):
"""
Return a paginated style `Response` object for the given output data.
"""
assert self.paginator is not None
return self.paginator.get_paginated_response(data)
return self.paginator.get_paginated_response(data, queryset)
# Concrete view classes that provide method handlers

2
rest_framework/mixins.py
View File

@ -42,7 +42,7 @@ class ListModelMixin(object):
page = self.paginate_queryset(queryset)
if page is not None:
serializer = self.get_serializer(page, many=True)
return self.get_paginated_response(serializer.data)
return self.get_paginated_response(serializer.data, queryset)
serializer = self.get_serializer(queryset, many=True)
return Response(serializer.data)

6
rest_framework/pagination.py
View File

@ -225,7 +225,7 @@ class PageNumberPagination(BasePagination):
self.request = request
return list(self.page)
def get_paginated_response(self, data):
def get_paginated_response(self, data, queryset):
return Response(OrderedDict([
('count', self.page.paginator.count),
('next', self.get_next_link()),
@ -346,7 +346,7 @@ class LimitOffsetPagination(BasePagination):
return []
return list(queryset[self.offset:self.offset + self.limit])
def get_paginated_response(self, data):
def get_paginated_response(self, data, queryset):
return Response(OrderedDict([
('count', self.count),
('next', self.get_next_link()),
@ -758,7 +758,7 @@ class CursorPagination(BasePagination):
attr = getattr(instance, field_name)
return six.text_type(attr)
def get_paginated_response(self, data):
def get_paginated_response(self, data, queryset):
return Response(OrderedDict([
('next', self.get_next_link()),
('previous', self.get_previous_link()),

6
tests/test_pagination.py
View File

@ -177,7 +177,7 @@ class TestPageNumberPagination:
return list(self.pagination.paginate_queryset(self.queryset, request))
def get_paginated_content(self, queryset):
response = self.pagination.get_paginated_response(queryset)
response = self.pagination.get_paginated_response(queryset, queryset)
return response.data
def get_html_context(self):
@ -287,7 +287,7 @@ class TestPageNumberPaginationOverride:
return list(self.pagination.paginate_queryset(self.queryset, request))
def get_paginated_content(self, queryset):
response = self.pagination.get_paginated_response(queryset)
response = self.pagination.get_paginated_response(queryset, queryset)
return response.data
def get_html_context(self):
@ -338,7 +338,7 @@ class TestLimitOffset:
return list(self.pagination.paginate_queryset(self.queryset, request))
def get_paginated_content(self, queryset):
response = self.pagination.get_paginated_response(queryset)
response = self.pagination.get_paginated_response(queryset, queryset)
return response.data
def get_html_context(self):