diff options
| author | Dan Watson <dcwatson@gmail.com> | 2016-05-07 15:49:41 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2016-05-07 15:49:41 -0400 |
| commit | ad403ffa45db3becc2fec727212538446b40d380 (patch) | |
| tree | c42024b558eda549a9360f1623e6ee1e110fc0ad /django | |
| parent | 72ff70fba5c457a3db6ebc30aea22e95f47436a9 (diff) | |
Fixed #26582 -- Added prettier admin display for list values.
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) |
