Ticket #2870: order.patch

contrib/admin/views/main.py

@@ -644 +644 @@
         # 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 = lookup_opts.admin.ordering or lookup_opts.ordering or ['-' + lookup_opts.pk.name]
+        ordering = lookup_opts.admin.ordering or lookup_opts.ordering or None #['-' + lookup_opts.pk.name]
+        if not ordering: return None, None
 
         # Normalize it to new-style ordering.
         ordering = handle_legacy_orderlist(ordering)
@@ -708 +709 @@
             elif isinstance(f.rel, models.ManyToOneRel):
                 rel_ordering = f.rel.to._meta.ordering and f.rel.to._meta.ordering[0] or f.rel.to._meta.pk.column
                 lookup_order_field = '%s.%s' % (f.rel.to._meta.db_table, rel_ordering)
+        if lookup_order_field:
+            # Set ordering.
+            qs = qs.order_by((self.order_type == 'desc' and '-' or '') + lookup_order_field)
 
-        # Set ordering.
-        qs = qs.order_by((self.order_type == 'desc' and '-' or '') + lookup_order_field)
-
         # Apply keyword searches.
         def construct_search(field_name):
             if field_name.startswith('^'):