diff options
| author | Alexander Gaevsky <sasha@sasha0.ru> | 2015-12-24 23:32:53 +0200 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-12-29 19:37:29 -0500 |
| commit | 312e488a218a0c115cd23243b328dee5aee45965 (patch) | |
| tree | 6af816d996f2d5cace588babe17eb92041b47db3 /django | |
| parent | 5f3c5e40b25f2b7ab1f42bfa0169fe40c35e97bb (diff) | |
[1.9.x] Fixed #25465 -- Restored line breaks conversion in admin readonly fields.
Backport of 69208a5a1c55d42ca0eaffa900be643d9f801089 from master
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/admin/helpers.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/django/contrib/admin/helpers.py b/django/contrib/admin/helpers.py index e673199e73..9c3440fe05 100644 --- a/django/contrib/admin/helpers.py +++ b/django/contrib/admin/helpers.py @@ -219,6 +219,7 @@ class AdminReadonlyField(object): result_repr = ", ".join(map(six.text_type, value.all())) else: result_repr = display_for_field(value, f, self.empty_value_display) + result_repr = linebreaksbr(result_repr) return conditional_escape(result_repr) |