Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
django-rest-framework
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
django-rest-framework
Commits
2bcad32d
Commit
2bcad32d
authored
Aug 21, 2013
by
Tom Christie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
If page size query param <= 0, just use default page size.
Closes #1028.
parent
4338e1e4
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
1 deletions
+10
-1
rest_framework/generics.py
+10
-1
No files found.
rest_framework/generics.py
View file @
2bcad32d
...
@@ -14,6 +14,15 @@ from rest_framework.settings import api_settings
...
@@ -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):
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment