Ticket #7099: t7099-nf-a-r7484.diff

django/contrib/admin/views/main.py

@@ -282 +282 @@
                         qs = qs.select_related()
                         break
 
-        # Calculate lookup_order_field.
-        # If the order-by field is a field with a relationship, order by the
-        # value in the related table.
-        lookup_order_field = self.order_field
-        order_type = self.order_type == 'desc' and '-' or ''
-        try:
-            f = self.lookup_opts.get_field(self.order_field, many_to_many=False)
-        except models.FieldDoesNotExist:
-            pass
-        else:
-            if isinstance(f.rel, models.OneToOneRel):
-                # For OneToOneFields, don't try to order by the related object's ordering criteria.
-                pass
-            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
-                if rel_ordering[0] == '-':
-                    rel_ordering = rel_ordering[1:]
-                    order_type = not order_type and '-' or ''
-                lookup_order_field = '%s.%s' % (f.rel.to._meta.db_table, rel_ordering)
-                # FIXME: Must use select_related() becuase the lookup field may
-                # be in a table not otherwise referenced yet.
-                qs = qs.select_related()
-
         # Set ordering.
-        qs = qs.order_by(order_type + lookup_order_field)
+        qs = qs.order_by('%s%s' % (self.order_type == 'desc' and '-' or '', self.order_field))
 
         # Apply keyword searches.
         def construct_search(field_name):