From 87a100b642316a5eb0db6299350208b6ed8f9248 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Tue, 15 Mar 2011 08:24:31 +0000 Subject: [PATCH] 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 --- django/views/generic/list.py | 2 +- tests/regressiontests/generic_views/list.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/django/views/generic/list.py b/django/views/generic/list.py index c50c0554fb..56684573a3 100644 --- a/django/views/generic/list.py +++ b/django/views/generic/list.py @@ -47,7 +47,7 @@ class MultipleObjectMixin(object): 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 diff --git a/tests/regressiontests/generic_views/list.py b/tests/regressiontests/generic_views/list.py index b784f4d659..c41680c701 100644 --- a/tests/regressiontests/generic_views/list.py +++ b/tests/regressiontests/generic_views/list.py @@ -46,7 +46,7 @@ class ListViewTests(TestCase): 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)