Permalink
Browse files

[1.5.x] Fixed #19429 -- Applied linebreaksbr to read-only fields in i…

…nlines

Applied to inlines what ec9d6b1 did for main fieldsets.
Backport of 553838a from master.
  • Loading branch information...
1 parent a8045c3 commit 57a41d985acabc7fc25f08081e58f0978cc8c1dc Marc Aymerich committed with claudep Dec 6, 2012
@@ -46,7 +46,7 @@
{% for field in line %}
<td{% if field.field.name %} class="field-{{ field.field.name }}"{% endif %}>
{% if field.is_readonly %}
- <p>{{ field.contents }}</p>
+ <p>{{ field.contents|linebreaksbr }}</p>
{% else %}
{{ field.field.errors.as_ul }}
{{ field.field }}
@@ -346,7 +346,10 @@ class LinkInline(admin.TabularInline):
model = Link
extra = 1
- readonly_fields = ("posted",)
+ readonly_fields = ("posted", "multiline")
+
+ def multiline(self, instance):
+ return "InlineMultiline\ntest\nstring"
class SubPostInline(admin.TabularInline):
@@ -3164,6 +3164,7 @@ def test_readonly_get(self):
# Checks that multiline text in a readonly field gets <br /> tags
self.assertContains(response, "Multiline<br />test<br />string")
+ self.assertContains(response, "InlineMultiline<br />test<br />string")
self.assertContains(response,
formats.localize(datetime.date.today() - datetime.timedelta(days=7))

0 comments on commit 57a41d9

Please sign in to comment.