Ticket #7503: list_display_takes_function.patch

django/contrib/admin/templatetags/admin_list.py

@@ -76 +76 @@
             f = lookup_opts.get_field(field_name)
             admin_order_field = None
         except models.FieldDoesNotExist:
+            attr = None
             # For non-field list_display values, check for the function
             # attribute "short_description". If that doesn't exist, fall back
             # to the method name. And __str__ and __unicode__ are special-cases.
@@ -84 +85 @@
             elif field_name == '__str__':
                 header = smart_str(lookup_opts.verbose_name)
             else:
-                attr = getattr(cl.model, field_name) # Let AttributeErrors propagate.
+                if callable(field_name): # field_name may be a function
+                    attr = field_name
+                else:
+                    attr = getattr(cl.model, field_name) # Let AttributeErrors propagate.
+                    
                 try:
                     header = attr.short_description
                 except AttributeError:
                     header = field_name.replace('_', ' ')
 
             # It is a non-field, but perhaps one that is sortable
-            admin_order_field = getattr(getattr(cl.model, field_name), "admin_order_field", None)
+            if not attr:
+                attr = getattr(cl.model, field_name)
+            admin_order_field = getattr(attr, "admin_order_field", None)
             if not admin_order_field:
                 yield {"text": header}
                 continue
@@ -141 +148 @@
                     result_repr = _boolean_icon(attr)
                 else:
                     result_repr = smart_unicode(attr)
+            except TypeError:
+                # if field_name is a callable, evaluate it passing result as
+                # first argument
+                if callable(field_name):
+                    result_repr = field_name(result)
+                else:
+                    raise
             except (AttributeError, ObjectDoesNotExist):
                 result_repr = EMPTY_CHANGELIST_VALUE
             else: