From 57a41d985acabc7fc25f08081e58f0978cc8c1dc Mon Sep 17 00:00:00 2001
From: Marc Aymerich <marcay@pangea.org>
Date: Thu, 6 Dec 2012 09:47:51 +0100
Subject: [1.5.x] Fixed #19429 -- Applied linebreaksbr to read-only fields in
 inlines

Applied to inlines what ec9d6b1122d did for main fieldsets.
Backport of 553838a28 from master.
---
 tests/regressiontests/admin_views/admin.py | 5 ++++-
 tests/regressiontests/admin_views/tests.py | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/regressiontests/admin_views/admin.py b/tests/regressiontests/admin_views/admin.py
index d71c398376..1e4e9b5c75 100644
--- a/tests/regressiontests/admin_views/admin.py
+++ b/tests/regressiontests/admin_views/admin.py
@@ -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):
diff --git a/tests/regressiontests/admin_views/tests.py b/tests/regressiontests/admin_views/tests.py
index d52ccafbd6..8579567438 100644
--- a/tests/regressiontests/admin_views/tests.py
+++ b/tests/regressiontests/admin_views/tests.py
@@ -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))
-- 
cgit v1.3