Ticket #10212: 10212.diff

contrib/admin/views/main.py

@@ -131 +131 @@
 
     def get_ordering(self):
         lookup_opts, params = self.lookup_opts, self.params
-        # For ordering, first check the "ordering" parameter in the admin
-        # options, then check the object's default ordering. If neither of
+        # For ordering, first check if `root_query_set` has an order_by clause.
+        # Then check the "ordering" parameter in the admin options,
+        # then check the object's default ordering. If none of
         # those exist, order descending by ID by default. Finally, look for
         # manually-specified ordering from the query string.
-        ordering = self.model_admin.ordering or lookup_opts.ordering or ['-' + lookup_opts.pk.name]
+        ordering = self.root_query_set.query.order_by or self.model_admin.ordering or lookup_opts.ordering or ['-' + lookup_opts.pk.name]
 
         if ordering[0].startswith('-'):
             order_field, order_type = ordering[0][1:], 'desc'