Commit 5a00a57a authored by Preston Holmes's avatar Preston Holmes
Browse files

Fixed #19240 -- include pagination error details in ListView 404 

Thanks to seawolf for the patch
parent 0a49e616

django/views/generic/list.py

+4 −3
Original line number Diff line number Diff line
@@ -50,9 +50,10 @@ class MultipleObjectMixin(ContextMixin): 
        try:

            page = paginator.page(page_number)

            return (paginator, page, page.object_list, page.has_other_pages())

        except InvalidPage:

            raise Http404(_('Invalid page (%(page_number)s)') % {

                                'page_number': page_number

        except InvalidPage as e:

            raise Http404(_('Invalid page (%(page_number)s): %(message)s') % {

                                'page_number': page_number,

                                'message': e.message,

            })



    def get_paginate_by(self, queryset):

tests/regressiontests/generic_views/list.py

+11 −1
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ from __future__ import absolute_import 


from django.core.exceptions import ImproperlyConfigured

from django.test import TestCase

from django.test.utils import override_settings

from django.views.generic.base import View



from .models import Author, Artist
@@ -171,8 +172,17 @@ class ListViewTests(TestCase): 
        with self.assertNumQueries(3):

            self.client.get('/list/authors/notempty/paginated/')



    @override_settings(DEBUG=True)

    def test_paginated_list_view_returns_useful_message_on_invalid_page(self):

        # test for #19240

        # tests that source exception's message is included in page

        self._make_authors(1)

        res = self.client.get('/list/authors/paginated/2/')

        self.assertEqual(res.status_code, 404)

        self.assertEqual(res.context.get('reason'),

                "Invalid page (2): That page contains no results")



    def _make_authors(self, n):

        Author.objects.all().delete()

        for i in range(n):

            Author.objects.create(name='Author %02i' % i, slug='a%s' % i)