Commit c31c2c92 authored by Luke Plant's avatar Luke Plant
Browse files

Made admin generated changelist URLs independent of dict ordering

parent 6b9f1302

django/contrib/admin/views/main.py

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ class ChangeList(object): 
                    del p[k]

            else:

                p[k] = v

        return '?%s' % urlencode(p)

        return '?%s' % urlencode(sorted(p.items()))



    def get_results(self, request):

        paginator = self.model_admin.get_paginator(request, self.query_set, self.list_per_page)

tests/regressiontests/admin_filters/tests.py

+2 −2
Original line number Diff line number Diff line
@@ -534,13 +534,13 @@ class ListFiltersTests(TestCase): 
        choices = list(filterspec.choices(changelist))

        self.assertEqual(choices[3]['display'], 'the 2000\'s')

        self.assertEqual(choices[3]['selected'], True)

        self.assertEqual(choices[3]['query_string'], '?publication-decade=the+00s&author__id__exact=%s' % self.alfred.pk)

        self.assertEqual(choices[3]['query_string'], '?author__id__exact=%s&publication-decade=the+00s' % self.alfred.pk)



        filterspec = changelist.get_filters(request)[0][0]

        self.assertEqual(force_text(filterspec.title), 'Verbose Author')

        choice = select_by(filterspec.choices(changelist), "display", "alfred")

        self.assertEqual(choice['selected'], True)

        self.assertEqual(choice['query_string'], '?publication-decade=the+00s&author__id__exact=%s' % self.alfred.pk)

        self.assertEqual(choice['query_string'], '?author__id__exact=%s&publication-decade=the+00s' % self.alfred.pk)



    def test_listfilter_without_title(self):

        """

tests/regressiontests/admin_views/tests.py

+5 −5
Original line number Diff line number Diff line
@@ -3545,14 +3545,14 @@ class DateHierarchyTests(TestCase): 


    def assert_contains_month_link(self, response, date):

        self.assertContains(

            response, '?release_date__year=%d&release_date__month=%d"' % (

                date.year, date.month))

            response, '?release_date__month=%d&release_date__year=%d"' % (

                date.month, date.year))



    def assert_contains_day_link(self, response, date):

        self.assertContains(

            response, '?release_date__year=%d&'

            'release_date__month=%d&release_date__day=%d"' % (

                date.year, date.month, date.day))

            response, '?release_date__day=%d&'

            'release_date__month=%d&release_date__year=%d"' % (

                date.day, date.month, date.year))



    def test_empty(self):

        """