Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #15575 -- Corrected handling of pagination in generic views to …

…match documentation and historical behavior. Thanks to Ivan Virabyan for the report and patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15820 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 87a100b642316a5eb0db6299350208b6ed8f9248 1 parent c966566
@freakboy3742 freakboy3742 authored
View
2  django/views/generic/list.py
@@ -47,7 +47,7 @@ def paginate_queryset(self, queryset, page_size):
raise Http404(_(u"Page is not 'last', nor can it be converted to an int."))
try:
page = paginator.page(page_number)
- return (paginator, page, page.object_list, True)
+ return (paginator, page, page.object_list, page.has_other_pages())
except InvalidPage:
raise Http404(_(u'Invalid page (%(page_number)s)') % {
'page_number': page_number
View
2  tests/regressiontests/generic_views/list.py
@@ -46,7 +46,7 @@ def test_paginated_queryset_shortdata(self):
self.assertIs(res.context['author_list'], res.context['object_list'])
self.assertEqual(res.context['page_obj'].number, 1)
self.assertEqual(res.context['paginator'].num_pages, 1)
- self.assertTrue(res.context['is_paginated'])
+ self.assertFalse(res.context['is_paginated'])
def test_paginated_get_page_by_query_string(self):
self._make_authors(100)
Please sign in to comment.
Something went wrong with that request. Please try again.