Changeset 2544

Timestamp:

03/21/06 12:31:31 (3 years ago)

Author:

jkocherhans

Message:

magic-removal: Fixed 'allow_tags' behavior for model methods in admin change lists.

Files:

• django/branches/magic-removal/django/contrib/admin/templatetags/admin_list.py (modified) (2 diffs)

django/branches/magic-removal/django/contrib/admin/templatetags/admin_list.py

@@ -115 +115 @@
-            try:
-                attr = getattr(result, field_name)
+                allow_tags = getattr(attr, 'allow_tags', False)
-                if callable(attr):
-                    attr = attr()
@@ -123 +124 @@
-                # Strip HTML tags in the resulting text, except if the
-                # function has an "allow_tags" attribute set to True.
-getattr(attr, 'allow_tags', False)
+allow_tags
-                    result_repr = escape(result_repr)
-        else: