Ticket #1326: list_display_properties_r2265.diff

django/core/management.py

@@ -889 +889 @@
                         try:
                             f = opts.get_field(fn)
                         except models.FieldDoesNotExist:
-                            if not hasattr(cls, fn) or not callable(getattr(cls, fn)):
-                                e.add(opts, '"admin.list_display" refers to %r, which isn\'t a field or method.' % fn)
+                            if not hasattr(cls, fn):
+                                e.add(opts, '"admin.list_display" refers to %r, which isn\'t a field, attribute, method, or property.' % fn)
                         else:
                             if isinstance(f, models.ManyToManyField):
                                 e.add(opts, '"admin.list_display" doesn\'t support ManyToManyFields (%r).' % fn)

django/contrib/admin/templatetags/admin_list.py

@@ -80 +80 @@
             if field_name == '__repr__':
                 header = lookup_opts.verbose_name
             else:
-                func = getattr(cl.model, field_name) # Let AttributeErrors propogate.
+                attr = getattr(cl.model, field_name) # Let AttributeErrors propogate.
                 try:
-                    header = func.short_description
+                    header = attr.short_description
                 except AttributeError:
-                    header = func.__name__.replace('_', ' ')
+                    header = field_name.replace('_', ' ')
             # Non-field list_display values don't get ordering capability.
             yield {"text": header}
         else:
@@ -113 +113 @@
             # For non-field list_display values, the value is a method
             # name. Execute the method.
             try:
-                func = getattr(result, field_name)
-                result_repr = str(func())
+                attr = getattr(result, field_name)
+                if callable(attr):
+                    attr = attr()
+                result_repr = str(attr)
             except AttributeError, ObjectDoesNotExist:
                 result_repr = EMPTY_CHANGELIST_VALUE
             else:
                 # Strip HTML tags in the resulting text, except if the
                 # function has an "allow_tags" attribute set to True.
-                if not getattr(func, 'allow_tags', False):
+                if not getattr(attr, 'allow_tags', False):
                     result_repr = escape(result_repr)
         else:
             field_val = getattr(result, f.attname)