Skip to content

Extracted page_size logic into get_page_number to allow overloading #6753

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Extracted page_size logic into get_page_number to allow overloading #6753

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions rest_framework/pagination.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,9 +195,7 @@ def paginate_queryset(self, queryset, request, view=None):
return None

paginator = self.django_paginator_class(queryset, page_size)
page_number = request.query_params.get(self.page_query_param, 1)
if page_number in self.last_page_strings:
page_number = paginator.num_pages
page_number = self.get_page_number(request, paginator)

try:
self.page = paginator.page(page_number)
Expand Down Expand Up @@ -235,6 +233,12 @@ def get_page_size(self, request):

return self.page_size

def get_page_number(self, request, paginator):
page_number = request.query_params.get(self.page_query_param, 1)
if page_number in self.last_page_strings:
return paginator.num_pages
return page_number

def get_next_link(self):
if not self.page.has_next():
return None
Expand Down