Ticket #19429: ticket_19429.diff

django/contrib/admin/templates/admin/edit_inline/tabular.html

@@ -46 +46 @@
             {% 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 }}

tests/regressiontests/admin_views/admin.py

@@ -346 +346 @@
     model = Link
     extra = 1
 
-    readonly_fields = ("posted",)
+    readonly_fields = ("posted", "multiline")
+
+    def multiline(self, instance):
+        return "InlineMultiline\ntest\nstring"
 
 
 class SubPostInline(admin.TabularInline):

tests/regressiontests/admin_views/tests.py

@@ -3164 +3164 @@
 
         # 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))