Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #766 -- Custom methods in admin.list_display can now have an al…

…low_tags attribute, which doesn't strip tags in the methods' output. Thanks, plisk

git-svn-id: http://code.djangoproject.com/svn/django/trunk@1174 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 632b63ad76efafff2f602de9c5a4464faa37d51b 1 parent cb222e4
Adrian Holovaty adrianholovaty authored
Showing with 7 additions and 1 deletion.
  1. +7 −1 django/contrib/admin/views/main.py
8 django/contrib/admin/views/main.py
View
@@ -388,10 +388,16 @@ def change_list(request, app_label, module_name):
except meta.FieldDoesNotExist:
# For non-field list_display values, the value is a method
# name. Execute the method.
+ func = getattr(result, field_name)
try:
- result_repr = strip_tags(str(getattr(result, field_name)()))
+ result_repr = str(func())
except 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):
+ result_repr = strip_tags(result_repr)
else:
field_val = getattr(result, f.attname)
# Foreign-key fields are special: Use the repr of the
Please sign in to comment.
Something went wrong with that request. Please try again.