Ticket #3397: admin_list.diff

django/contrib/admin/templatetags/admin_list.py

@@ -72 +72 @@
     for i, field_name in enumerate(lookup_opts.admin.list_display):
         try:
             f = lookup_opts.get_field(field_name)
+            admin_order_field = None
         except models.FieldDoesNotExist:
             # For non-field list_display values, check for the function
             # attribute "short_description". If that doesn't exist, fall
@@ -86 +87 @@
                     header = field_name.replace('_', ' ')
 
             # It is a non-field, but perhaps one that is sortable
-            if not getattr(getattr(cl.model, field_name), "admin_order_field", None):
+            admin_order_field = getattr(getattr(cl.model, field_name), "admin_order_field", None)
+            if not admin_order_field:
                 yield {"text": header}
                 continue
 
@@ -101 +103 @@
 
         th_classes = []
         new_order_type = 'asc'
-        if field_name == cl.order_field:
+        if field_name == cl.order_field or admin_order_field == cl.order_field:
             th_classes.append('sorted %sending' % cl.order_type.lower())
             new_order_type = {'asc': 'desc', 'desc': 'asc'}[cl.order_type.lower()]