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

Merge a8475e3969 into f92d8bd972

Browse Source
This commit is contained in:
Ross McFarland 2013-10-23 13:24:40 -07:00
commit 6a693ddbd0
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rest_framework/generics.py
View File

@ -59,6 +59,7 @@ class GenericAPIView(views.APIView):
# Pagination settings
paginate_by = api_settings.PAGINATE_BY
paginate_by_param = api_settings.PAGINATE_BY_PARAM
paginate_default_page = api_settings.PAGINATE_DEFAULT_PAGE
max_paginate_by = api_settings.MAX_PAGINATE_BY
pagination_serializer_class = api_settings.DEFAULT_PAGINATION_SERIALIZER_CLASS
page_kwarg = 'page'
@ -146,7 +147,7 @@ class GenericAPIView(views.APIView):
allow_empty_first_page=self.allow_empty)
page_kwarg = self.kwargs.get(self.page_kwarg)
page_query_param = self.request.QUERY_PARAMS.get(self.page_kwarg)
page = page_kwarg or page_query_param or 1
page = page_kwarg or page_query_param or self.paginate_default_page
try:
page_number = paginator.validate_number(page)
except InvalidPage:

1
rest_framework/settings.py
View File

@ -67,6 +67,7 @@ DEFAULTS = {
# Pagination
'PAGINATE_BY': None,
'PAGINATE_BY_PARAM': None,
'PAGINATE_DEFAULT_PAGE': 1,
'MAX_PAGINATE_BY': None,
# Authentication