Fixed #19429 -- Applied linebreaksbr to read-only fields in inlines

Applied to inlines what ec9d6b1122 did for main fieldsets.
This commit is contained in:
Marc Aymerich 2012-12-06 09:47:51 +01:00 committed by Claude Paroz
parent 37abad73d6
commit 553838a285
3 changed files with 6 additions and 2 deletions

View File

@ -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 }}

View File

@ -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):

View File

@ -3164,6 +3164,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, "InlineMultiline<br />test<br />string")
self.assertContains(response,
formats.localize(datetime.date.today() - datetime.timedelta(days=7))