diff options
author | Tim Graham <timograham@gmail.com> | 2018-06-14 14:22:04 -0400 |
---|---|---|
committer | Tim Graham <timograham@gmail.com> | 2018-06-14 14:22:04 -0400 |
commit | 0d8e3e608ee9aab5076d497664aa97e0a29e523e (patch) | |
tree | 803ec16cb7263dd845900185dc1eb9fd1fc6a1ac /tests/admin_changelist | |
parent | a77f21880dfb0631ea0adb22d47909915cbfc3a9 (diff) | |
download | django-0d8e3e608ee9aab5076d497664aa97e0a29e523e.tar.gz |
Fixed #29428 -- Fixed admin changelist crash when using a query expression without asc()/desc() in the ordering.
Diffstat (limited to 'tests/admin_changelist')
-rw-r--r-- | tests/admin_changelist/tests.py | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/tests/admin_changelist/tests.py b/tests/admin_changelist/tests.py index 9f9150f34d..6c9b424a5a 100644 --- a/tests/admin_changelist/tests.py +++ b/tests/admin_changelist/tests.py @@ -77,6 +77,17 @@ class ChangeListTests(TestCase): cl = m.get_changelist_instance(request) self.assertEqual(cl.get_ordering_field_columns(), {3: 'desc', 2: 'asc'}) + def test_specified_ordering_by_f_expression_without_asc_desc(self): + class OrderedByFBandAdmin(admin.ModelAdmin): + list_display = ['name', 'genres', 'nr_of_members'] + ordering = (F('nr_of_members'), Upper('name'), F('genres')) + + m = OrderedByFBandAdmin(Band, custom_site) + request = self.factory.get('/band/') + request.user = self.superuser + cl = m.get_changelist_instance(request) + self.assertEqual(cl.get_ordering_field_columns(), {3: 'asc', 2: 'asc'}) + def test_select_related_preserved(self): """ Regression test for #10348: ChangeList.get_queryset() shouldn't |