Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Made admin generated changelist URLs independent of dict ordering

  • Loading branch information...
commit c31c2c92b8ef0b58394ac55fa4f61acc07091047 1 parent 6b9f130
@spookylukey spookylukey authored
View
2  django/contrib/admin/views/main.py
@@ -158,7 +158,7 @@ def get_query_string(self, new_params=None, remove=None):
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)
View
4 tests/regressiontests/admin_filters/tests.py
@@ -534,13 +534,13 @@ def test_simplelistfilter(self):
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):
"""
View
10 tests/regressiontests/admin_views/tests.py
@@ -3545,14 +3545,14 @@ def assert_contains_year_link(self, response, date):
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):
"""
Please sign in to comment.
Something went wrong with that request. Please try again.