Ticket #10212: admin_ordering.diff

django/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
-        # 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]
-
-        if ordering[0].startswith('-'):
-            order_field, order_type = ordering[0][1:], 'desc'
+        # If the root query set has no ordering, order descending by ID.
+        # Set explicit ordering if it is specified in the query string.
+        if self.root_query_set.query.has_ordering():
+            # self.root_queryset already has ordering, don't over-ride it
+            order_field, order_type = None, 'asc'
         else:
-            order_field, order_type = ordering[0], 'asc'
+            order_field, order_type = lookup_opts.pk.name, 'desc'
+
         if ORDER_VAR in params:
             try:
                 field_name = self.list_display[int(params[ORDER_VAR])]

django/db/models/sql/query.py

@@ -596 +596 @@
                 result.append(elt)
         return result, params
 
+    def has_ordering(self):
+        """
+        Return True if ordering will be set on this query.
+        """
+        return bool(self.extra_order_by or self.order_by or (self.default_ordering and self.model._meta.ordering))
+
     def get_ordering(self):
         """
         Returns list representing the SQL elements in the "order by" clause.