mirror of
https://github.com/encode/django-rest-framework.git
synced 2024-11-28 12:34:00 +03:00
Use absolute URLs for previous and next links when paginating
This commit is contained in:
parent
7fa082489b
commit
5a26cadc76
|
@ -668,7 +668,7 @@ class PaginatorMixin(object):
|
||||||
if limit != self.limit:
|
if limit != self.limit:
|
||||||
url = url.set_query_param('limit', str(limit))
|
url = url.set_query_param('limit', str(limit))
|
||||||
|
|
||||||
return url
|
return self.request.build_absolute_uri(url)
|
||||||
|
|
||||||
def next(self, page):
|
def next(self, page):
|
||||||
"""
|
"""
|
||||||
|
|
|
@ -191,6 +191,41 @@ class TestPagination(TestCase):
|
||||||
|
|
||||||
self.assertEqual(range(0, limit), content['results'])
|
self.assertEqual(range(0, limit), content['results'])
|
||||||
|
|
||||||
|
def test_prev_and_next_link_urls(self):
|
||||||
|
""" Tests that the prev and next links are valid """
|
||||||
|
# For the first page...
|
||||||
|
request = self.req.get('/paginator')
|
||||||
|
response = MockPaginatorView.as_view(limit=10)(request)
|
||||||
|
content = json.loads(response.content)
|
||||||
|
|
||||||
|
self.assertIsNone(content['previous'])
|
||||||
|
self.assertEqual(content['next'], 'http://testserver/paginator?page=2')
|
||||||
|
|
||||||
|
# For the second page...
|
||||||
|
request = self.req.get('/paginator?page=2')
|
||||||
|
response = MockPaginatorView.as_view(limit=10)(request)
|
||||||
|
content = json.loads(response.content)
|
||||||
|
|
||||||
|
self.assertEqual(content['previous'], 'http://testserver/paginator?page=1')
|
||||||
|
self.assertEqual(content['next'], 'http://testserver/paginator?page=3')
|
||||||
|
|
||||||
|
# For the last page...
|
||||||
|
request = self.req.get('/paginator?page=6')
|
||||||
|
response = MockPaginatorView.as_view(limit=10)(request)
|
||||||
|
content = json.loads(response.content)
|
||||||
|
|
||||||
|
self.assertEqual(content['previous'], 'http://testserver/paginator?page=5')
|
||||||
|
self.assertIsNone(content['next'])
|
||||||
|
|
||||||
|
def test_prev_and_next_link_urls_with_other_params(self):
|
||||||
|
""" Tests that the prev and next links work with other query params """
|
||||||
|
request = self.req.get('/paginator/?page=2&filter_param=xyz')
|
||||||
|
response = MockPaginatorView.as_view(limit=10)(request)
|
||||||
|
content = json.loads(response.content)
|
||||||
|
|
||||||
|
self.assertEqual(content['previous'], 'http://testserver/paginator/?filter_param=xyz&page=1')
|
||||||
|
self.assertEqual(content['next'], 'http://testserver/paginator/?filter_param=xyz&page=3')
|
||||||
|
|
||||||
def test_limit_param(self):
|
def test_limit_param(self):
|
||||||
""" Tests if the client can set the limit """
|
""" Tests if the client can set the limit """
|
||||||
from math import ceil
|
from math import ceil
|
||||||
|
|
Loading…
Reference in New Issue
Block a user