Ticket #2884: get_query_set.patch

django/contrib/admin/views/main.py

@@ -669 +669 @@
         return order_field, order_type
 
     def get_query_set(self):
+        def follow_fkey_ordering(field, fields_seen = None):
+            fields_seen = fields_seen or []
+            related_object = field.rel.to
+            ordering = related_object._meta.ordering
+            if ordering:
+                ordering_field = related_object._meta.get_field(ordering[0])
+                if isinstance(ordering_field.rel, models.ManyToOneRel) and not (field in fields_seen):
+                    fields_seen.append(field)
+                    rel_table, rel_ordering = follow_fkey_ordering(ordering_field, fields_seen)
+                else:
+                    rel_ordering = ordering_field.column
+                    rel_table = related_object._meta.db_table
+            else:
+                rel_ordering = related_object._meta.pk.column
+                rel_table = related_object._meta.db_table
+            return rel_table, rel_ordering
+
         qs = self.manager.get_query_set()
         lookup_params = self.params.copy() # a dictionary of the query string
         for i in (ALL_VAR, ORDER_VAR, ORDER_TYPE_VAR, SEARCH_VAR, IS_POPUP_VAR):
@@ -706 +723 @@
                 # 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
-                lookup_order_field = '%s.%s' % (f.rel.to._meta.db_table, rel_ordering)
+                #Recursively follows ForeignKey fields to get the correct table name and field for order_by.
+                ordering_table, ordering_field = follow_fkey_ordering(f)
+                lookup_order_field = '%s.%s' % (ordering_table, ordering_field)
 
         # Set ordering.
         qs = qs.order_by((self.order_type == 'desc' and '-' or '') + lookup_order_field)