From c0f3555eef0ebf877111bfb2de65b95f0c5a6b7b Mon Sep 17 00:00:00 2001 From: Joseph Kocherhans Date: Tue, 21 Mar 2006 18:31:31 +0000 Subject: [PATCH] magic-removal: Fixed 'allow_tags' behavior for model methods in admin change lists. git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2544 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/contrib/admin/templatetags/admin_list.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/django/contrib/admin/templatetags/admin_list.py b/django/contrib/admin/templatetags/admin_list.py index 8358fb39ce..2352f19451 100644 --- a/django/contrib/admin/templatetags/admin_list.py +++ b/django/contrib/admin/templatetags/admin_list.py @@ -114,6 +114,7 @@ def items_for_result(cl, result): # or a property. try: attr = getattr(result, field_name) + allow_tags = getattr(attr, 'allow_tags', False) if callable(attr): attr = attr() result_repr = str(attr) @@ -122,7 +123,7 @@ def items_for_result(cl, result): else: # Strip HTML tags in the resulting text, except if the # function has an "allow_tags" attribute set to True. - if not getattr(attr, 'allow_tags', False): + if not allow_tags: result_repr = escape(result_repr) else: field_val = getattr(result, f.attname)