Ticket #18388: ticket_18338.diff

django/contrib/admin/options.py

@@ -1467 +1467 @@
             "fields": fields,
             "exclude": exclude,
             "formfield_callback": partial(self.formfield_for_dbfield, request=request),
-            "extra": self.extra,
-            "max_num": self.max_num,
+            "extra": self.get_extra(),
+            "max_num": self.get_max_num(),
             "can_delete": can_delete,
         }
         defaults.update(kwargs)
@@ -1519 +1519 @@
         return request.user.has_perm(
             self.opts.app_label + '.' + self.opts.get_delete_permission())
 
+    def get_extra(self):
+        return self.extra
+
+    def get_max_num(self):
+        return self.max_num
+
 
 class StackedInline(InlineModelAdmin):
     template = 'admin/edit_inline/stacked.html'

django/contrib/admin/templates/admin/includes/fieldset.html

@@ -14 +14 @@
                     {% else %}
                         {{ field.label_tag }}
                         {% if field.is_readonly %}
-                            <p>{{ field.contents }}</p>
+                            <p>{{ field.contents|linebreaksbr }}</p>
                         {% else %}
                             {{ field.field }}
                         {% endif %}

tests/regressiontests/admin_views/tests.py

@@ -3163 +3163 @@
         self.assertContains(response, '<p class="help">Some help text for the content (with unicode ŠĐĆŽćžšđ)</p>', html=True)
         self.assertContains(response, '<p class="help">Some help text for the date (with unicode ŠĐĆŽćžšđ)</p>', html=True)
 
-        p = Post.objects.create(title="I worked on readonly_fields", content="Its good stuff")
+        new_post_title = "I worked on\n multiline\n readonly_fields"
+        p = Post.objects.create(title=new_post_title, content="Its good stuff")
         response = self.client.get('/test_admin/admin/admin_views/post/%d/' % p.pk)
         self.assertContains(response, "%d amount of cool" % p.pk)
-
+        self.assertContains(response, new_post_title)
+        
     def test_readonly_post(self):
         data = {
             "title": "Django Got Readonly Fields",