Ticket #17308: patch_r17159.diff

django/contrib/admin/util.py

@@ -289 +289 @@
 
             if hasattr(attr, "short_description"):
                 label = attr.short_description
+            elif isinstance(attr, property) and hasattr(attr, "fget") and hasattr(attr.fget, "short_description"):
+                label = attr.fget.short_description
             elif callable(attr):
                 if attr.__name__ == "<lambda>":
                     label = "--"