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

If page size query param <= 0, just use default page size.

Browse Source 
Closes #1028.
This commit is contained in:
Tom Christie 2013-08-21 21:22:12 +01:00
parent 4338e1e43f
commit 2bcad32dcb
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
rest_framework/generics.py
View File

@ -14,6 +14,15 @@ from rest_framework.settings import api_settings
import warnings import warnings
def strict_positive_int(integer_string):
"""
Cast a string to a strictly positive integer.
"""
ret = int(integer_string)
if ret <= 0:
raise ValueError()
return ret
def get_object_or_404(queryset, **filter_kwargs): def get_object_or_404(queryset, **filter_kwargs):
""" """
Same as Django's standard shortcut, but make sure to raise 404 Same as Django's standard shortcut, but make sure to raise 404
@ -135,7 +144,7 @@ class GenericAPIView(views.APIView):
page_query_param = self.request.QUERY_PARAMS.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 1
try: try:
page_number = int(page) page_number = strict_positive_int(page)
except ValueError: except ValueError:
if page == 'last': if page == 'last':
page_number = paginator.num_pages page_number = paginator.num_pages