From 2a4321ba23042c962f8dc966779239244c6e4402 Mon Sep 17 00:00:00 2001 From: ldeluigi <44567586+ldeluigi@users.noreply.github.com> Date: Wed, 11 Sep 2024 09:04:46 +0200 Subject: [PATCH] Fixed #35747 -- Used default ordering when the ORDER_VAR param is blank in the admin changelist. --- django/contrib/admin/views/main.py | 2 +- tests/admin_changelist/tests.py | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/django/contrib/admin/views/main.py b/django/contrib/admin/views/main.py index 70b6590811..ada8ce39fc 100644 --- a/django/contrib/admin/views/main.py +++ b/django/contrib/admin/views/main.py @@ -395,7 +395,7 @@ class ChangeList: ordering = list( self.model_admin.get_ordering(request) or self._get_default_ordering() ) - if ORDER_VAR in params: + if params.get(ORDER_VAR): # Clear ordering and used params ordering = [] order_params = params[ORDER_VAR].split(".") diff --git a/tests/admin_changelist/tests.py b/tests/admin_changelist/tests.py index 694f807781..d8055a809b 100644 --- a/tests/admin_changelist/tests.py +++ b/tests/admin_changelist/tests.py @@ -1328,6 +1328,20 @@ class ChangeListTests(TestCase): UnorderedObjectAdmin.ordering = ["id", "bool"] check_results_order(ascending=True) + def test_ordering_from_model_meta(self): + Swallow.objects.create(origin="Swallow A", load=4, speed=2) + Swallow.objects.create(origin="Swallow B", load=2, speed=1) + Swallow.objects.create(origin="Swallow C", load=5, speed=1) + m = SwallowAdmin(Swallow, custom_site) + request = self._mocked_authenticated_request("/swallow/?o=", self.superuser) + changelist = m.get_changelist_instance(request) + queryset = changelist.get_queryset(request) + self.assertQuerySetEqual( + queryset, + [(1.0, 2.0), (1.0, 5.0), (2.0, 4.0)], + lambda s: (s.speed, s.load), + ) + def test_deterministic_order_for_model_ordered_by_its_manager(self): """ The primary key is used in the ordering of the changelist's results to