diff options
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/admin/utils.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/django/contrib/admin/utils.py b/django/contrib/admin/utils.py index 029fe3857a..15dca40dc4 100644 --- a/django/contrib/admin/utils.py +++ b/django/contrib/admin/utils.py @@ -402,7 +402,7 @@ def display_for_field(value, field, empty_value_display): elif isinstance(field, models.FileField) and value: return format_html('<a href="{}">{}</a>', value.url, value) else: - return smart_text(value) + return display_for_value(value, empty_value_display) def display_for_value(value, empty_value_display, boolean=False): @@ -418,6 +418,8 @@ def display_for_value(value, empty_value_display, boolean=False): return formats.localize(value) elif isinstance(value, six.integer_types + (decimal.Decimal, float)): return formats.number_format(value) + elif isinstance(value, (list, tuple)): + return ', '.join(force_text(v) for v in value) else: return smart_text(value) |