Skip to content

Django: fixes pagination parameter #128

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Django: fixes pagination parameter #128

Show file tree
Hide file tree
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
6 changes: 4 additions & 2 deletions restless/dj.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,10 @@ def serialize_list(self, data):
if getattr(self, 'paginate', False):
page_size = getattr(self, 'page_size', getattr(settings, 'RESTLESS_PAGE_SIZE', 10))
paginator = Paginator(data, page_size)

page_number = self.request.GET.get('p', 1)
try:
page_number = int(self.request.GET.get('p', 1))
except ValueError:
raise BadRequest('Invalid page number')

if page_number not in paginator.page_range:
raise BadRequest('Invalid page number')
Expand Down
8 changes: 8 additions & 0 deletions tests/test_dj.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,14 @@ def test_as_list_paginated_invalid_page(self):
self.assertEqual(resp['Content-Type'], 'application/json')
self.assertEqual(resp.status_code, 400)

def test_as_list_paginated_page_number_is_not_integer(self):
list_endpoint = DjTestResourcePaginated().as_list()
req = FakeHttpRequest('GET', get_request={'p': 'string'})

resp = list_endpoint(req)
self.assertEqual(resp['Content-Type'], 'application/json')
self.assertEqual(resp.status_code, 400)

def test_as_detail(self):
detail_endpoint = DjTestResource.as_detail()
req = FakeHttpRequest('GET')
Expand Down