mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-23 01:25:58 +00:00
Code Issues 25 Releases Wiki Activity

Fixed #35747 -- Used default ordering when the ORDER_VAR param is blank in the admin changelist.

Browse Source
This commit is contained in:
ldeluigi 2024-09-11 09:04:46 +02:00 committed by Sarah Boyce
parent 371a9f3c5f
commit 2a4321ba23
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/contrib/admin/views/main.py
View File

@ -395,7 +395,7 @@ class ChangeList:
ordering = list( ordering = list(
self.model_admin.get_ordering(request) or self._get_default_ordering() 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 # Clear ordering and used params
ordering = [] ordering = []
order_params = params[ORDER_VAR].split(".") order_params = params[ORDER_VAR].split(".")

14
tests/admin_changelist/tests.py
View File

@ -1328,6 +1328,20 @@ class ChangeListTests(TestCase):
UnorderedObjectAdmin.ordering = ["id", "bool"] UnorderedObjectAdmin.ordering = ["id", "bool"]
check_results_order(ascending=True) 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): 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 The primary key is used in the ordering of the changelist's results to