summaryrefslogtreecommitdiff
path: root/tests
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 /tests
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 'tests')
-rw-r--r--tests/admin_views/admin.py9
-rw-r--r--tests/admin_views/tests.py1
2 files changed, 8 insertions, 2 deletions
diff --git a/tests/admin_views/admin.py b/tests/admin_views/admin.py
index e9c6d4dc4c..a392daf293 100644
--- a/tests/admin_views/admin.py
+++ b/tests/admin_views/admin.py
@@ -15,6 +15,7 @@ from django.conf.urls import patterns, url
from django.forms.models import BaseModelFormSet
from django.http import HttpResponse, StreamingHttpResponse
from django.contrib.admin import BooleanFieldListFilter
+from django.utils.safestring import mark_safe
from django.utils.six import StringIO
from .models import (Article, Chapter, Child, Parent, Picture, Widget,
@@ -407,8 +408,8 @@ class PrePopulatedPostAdmin(admin.ModelAdmin):
class PostAdmin(admin.ModelAdmin):
list_display = ['title', 'public']
readonly_fields = (
- 'posted', 'awesomeness_level', 'coolness', 'value', 'multiline',
- lambda obj: "foo"
+ 'posted', 'awesomeness_level', 'coolness', 'value',
+ 'multiline', 'multiline_html', lambda obj: "foo"
)
inlines = [
@@ -427,6 +428,10 @@ class PostAdmin(admin.ModelAdmin):
def multiline(self, instance):
return "Multiline\ntest\nstring"
+ def multiline_html(self, instance):
+ return mark_safe("Multiline<br>\nhtml<br>\ncontent")
+ multiline_html.allow_tags = True
+
value.short_description = 'Value in $US'
diff --git a/tests/admin_views/tests.py b/tests/admin_views/tests.py
index c39e99aa1b..a88117fa6f 100644
--- a/tests/admin_views/tests.py
+++ b/tests/admin_views/tests.py
@@ -3622,6 +3622,7 @@ class ReadonlyTest(TestCase):
# Checks that multiline text in a readonly field gets <br /> tags
self.assertContains(response, "Multiline<br />test<br />string")
+ self.assertContains(response, "<p>Multiline<br />html<br />content</p>", html=True)
self.assertContains(response, "InlineMultiline<br />test<br />string")
self.assertContains(response,