p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed inconsistency in ListView's pagination (short datasets should also trigger a pagination, but with a single possible page) 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15155 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Andrew Godwin 2011-01-08 13:15:44 +00:00
parent 19ab52f77f
commit 32a344dfe2
2 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
django/views/generic/list.py
View File

@ -36,22 +36,19 @@ class MultipleObjectMixin(object):
Paginate the queryset, if needed. Paginate the queryset, if needed.
""" """
paginator = self.get_paginator(queryset, page_size, allow_empty_first_page=self.get_allow_empty()) paginator = self.get_paginator(queryset, page_size, allow_empty_first_page=self.get_allow_empty())
if paginator.num_pages > 1: page = self.kwargs.get('page') or self.request.GET.get('page') or 1
page = self.kwargs.get('page') or self.request.GET.get('page') or 1 try:
try: page_number = int(page)
page_number = int(page) except ValueError:
except ValueError: if page == 'last':
if page == 'last': page_number = paginator.num_pages
page_number = paginator.num_pages else:
else: raise Http404("Page is not 'last', nor can it be converted to an int.")
raise Http404("Page is not 'last', nor can it be converted to an int.") try:
try: page = paginator.page(page_number)
page = paginator.page(page_number) return (paginator, page, page.object_list, True)
return (paginator, page, page.object_list, True) except InvalidPage:
except InvalidPage: raise Http404(u'Invalid page (%s)' % page_number)
raise Http404(u'Invalid page (%s)' % page_number)
else:
return (None, None, queryset, False)
def get_paginate_by(self, queryset): def get_paginate_by(self, queryset):
""" """

9
tests/regressiontests/generic_views/list.py
View File

@ -38,14 +38,15 @@ class ListViewTests(TestCase):
self.assertEqual(list(res.context['authors'])[-1].name, 'Author 29') self.assertEqual(list(res.context['authors'])[-1].name, 'Author 29')
def test_paginated_queryset_shortdata(self): def test_paginated_queryset_shortdata(self):
# Test that short datasets ALSO result in a paginated view.
res = self.client.get('/list/authors/paginated/') res = self.client.get('/list/authors/paginated/')
self.assertEqual(res.status_code, 200) self.assertEqual(res.status_code, 200)
self.assertTemplateUsed(res, 'generic_views/author_list.html') self.assertTemplateUsed(res, 'generic_views/author_list.html')
self.assertEqual(list(res.context['object_list']), list(Author.objects.all())) self.assertEqual(list(res.context['object_list']), list(Author.objects.all()))
self.assertIs(res.context['authors'], res.context['object_list']) self.assertIs(res.context['authors'], res.context['object_list'])
self.assertIsNone(res.context['paginator']) self.assertEqual(res.context['page_obj'].number, 1)
self.assertIsNone(res.context['page_obj']) self.assertEqual(res.context['paginator'].num_pages, 1)
self.assertFalse(res.context['is_paginated']) self.assertTrue(res.context['is_paginated'])
def test_paginated_get_page_by_query_string(self): def test_paginated_get_page_by_query_string(self):
self._make_authors(100) self._make_authors(100)
@ -90,7 +91,7 @@ class ListViewTests(TestCase):
self._make_authors(7) self._make_authors(7)
res = self.client.get('/list/authors/paginated/custom_class/') res = self.client.get('/list/authors/paginated/custom_class/')
self.assertEqual(res.status_code, 200) self.assertEqual(res.status_code, 200)
self.assertIsNone(res.context['paginator']) self.assertEqual(res.context['paginator'].num_pages, 1)
# Custom pagination allows for 2 orphans on a page size of 5 # Custom pagination allows for 2 orphans on a page size of 5
self.assertEqual(len(res.context['object_list']), 7) self.assertEqual(len(res.context['object_list']), 7)