summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2014-03-22 17:00:50 +0100
committerClaude Paroz <claude@2xlibre.net>2014-03-22 17:11:12 +0100
commitd345a030c2f3b332512e5091248dd8b06e859eac (patch)
tree70e2a83aeb4c9bc9be95d513cbbc8a3aa7cb76fa /django
parent908bdea482d0a5af7a4c9d38ae52ed876d30cbe4 (diff)
[1.7.x] Fixed #22241 -- Selectively added line breaks in admin read-only fields
When content is supposed to contain HTML, we do not try to add line breaks in read-only contents. Thanks Alexander Todorov for the report. Backport of c94bff2 from master.
Diffstat (limited to 'django')
-rw-r--r--django/contrib/admin/helpers.py4
-rw-r--r--django/contrib/admin/templates/admin/edit_inline/tabular.html2
-rw-r--r--django/contrib/admin/templates/admin/includes/fieldset.html2
3 files changed, 5 insertions, 3 deletions
diff --git a/django/contrib/admin/helpers.py b/django/contrib/admin/helpers.py
index 50d089255b..bf80ac5d48 100644
--- a/django/contrib/admin/helpers.py
+++ b/django/contrib/admin/helpers.py
@@ -7,7 +7,7 @@ from django.contrib.admin.templatetags.admin_static import static
from django.core.exceptions import ObjectDoesNotExist
from django.db.models.fields.related import ManyToManyRel
from django.forms.utils import flatatt
-from django.template.defaultfilters import capfirst
+from django.template.defaultfilters import capfirst, linebreaksbr
from django.utils.encoding import force_text, smart_text
from django.utils.html import conditional_escape, format_html
from django.utils.safestring import mark_safe
@@ -182,6 +182,8 @@ class AdminReadonlyField(object):
result_repr = smart_text(value)
if getattr(attr, "allow_tags", False):
result_repr = mark_safe(result_repr)
+ else:
+ result_repr = linebreaksbr(result_repr)
else:
if isinstance(f.rel, ManyToManyRel) and value is not None:
result_repr = ", ".join(map(six.text_type, value.all()))
diff --git a/django/contrib/admin/templates/admin/edit_inline/tabular.html b/django/contrib/admin/templates/admin/edit_inline/tabular.html
index 2a3463280d..9ef6e8f1d5 100644
--- a/django/contrib/admin/templates/admin/edit_inline/tabular.html
+++ b/django/contrib/admin/templates/admin/edit_inline/tabular.html
@@ -47,7 +47,7 @@
{% if not field.field.is_hidden %}
<td{% if field.field.name %} class="field-{{ field.field.name }}"{% endif %}>
{% if field.is_readonly %}
- <p>{{ field.contents|linebreaksbr }}</p>
+ <p>{{ field.contents }}</p>
{% else %}
{{ field.field.errors.as_ul }}
{{ field.field }}
diff --git a/django/contrib/admin/templates/admin/includes/fieldset.html b/django/contrib/admin/templates/admin/includes/fieldset.html
index f38564c5af..c45e731faf 100644
--- a/django/contrib/admin/templates/admin/includes/fieldset.html
+++ b/django/contrib/admin/templates/admin/includes/fieldset.html
@@ -14,7 +14,7 @@
{% else %}
{{ field.label_tag }}
{% if field.is_readonly %}
- <p>{{ field.contents|linebreaksbr }}</p>
+ <p>{{ field.contents }}</p>
{% else %}
{{ field.field }}
{% endif %}