From c2e2893460bd90d3f453ad2295a02eb5cc0a1bde Mon Sep 17 00:00:00 2001
From: Adrian Holovaty <adrian@holovaty.com>
Date: Sat, 4 Feb 2006 19:31:39 +0000
Subject: [PATCH] magic-removal: Fixed #1326 -- Allowed model properties in
 list_display. Thanks, Kieran Holland

git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2268 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 .../contrib/admin/templatetags/admin_list.py   | 18 ++++++++++--------
 django/core/management.py                      |  4 ++--
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/django/contrib/admin/templatetags/admin_list.py b/django/contrib/admin/templatetags/admin_list.py
index 78127667fa..a9ba6d5bea 100644
--- a/django/contrib/admin/templatetags/admin_list.py
+++ b/django/contrib/admin/templatetags/admin_list.py
@@ -80,11 +80,11 @@ def result_headers(cl):
             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:
@@ -110,17 +110,19 @@ def items_for_result(cl, result):
         try:
             f = cl.lookup_opts.get_field(field_name)
         except models.FieldDoesNotExist:
-            # For non-field list_display values, the value is a method
-            # name. Execute the method.
+            # For non-field list_display values, the value is either a method
+            # or a property.
             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)
diff --git a/django/core/management.py b/django/core/management.py
index b5cee58bbd..c746933784 100644
--- a/django/core/management.py
+++ b/django/core/management.py
@@ -889,8 +889,8 @@ def get_validation_errors(outfile):
                         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 an attribute, method or property.' % fn)
                         else:
                             if isinstance(f, models.ManyToManyField):
                                 e.add(opts, '"admin.list_display" doesn\'t support ManyToManyFields (%r).' % fn)