Ticket #19226: ticket_19226.3.diff

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/admin.py

@@ -388 +388 @@
 
 class PostAdmin(admin.ModelAdmin):
     list_display = ['title', 'public']
-    readonly_fields = ('posted', 'awesomeness_level', 'coolness', 'value', lambda obj: "foo")
+    readonly_fields = ('posted', 'awesomeness_level', 'coolness', 'value', 'multiline_capatible', lambda obj: "foo")
 
     inlines = [
         LinkInline
@@ -402 +402 @@
 
     def value(self, instance):
         return 1000
+
+    def multiline_capatible:
+        return "Positive\n multiline\n capatible"
+    
     value.short_description = 'Value in $US'
 
 

tests/regressiontests/admin_views/tests.py

@@ -3149 +3149 @@
         self.assertContains(response, "Very awesome.")
         self.assertContains(response, "Unkown coolness.")
         self.assertContains(response, "foo")
+
+        # Checks correct multiline text for readonly field
+        self.assertContains(response, "Positive\n multiline\n capatible")
+        
         self.assertContains(response,
             formats.localize(datetime.date.today() - datetime.timedelta(days=7))
         )
@@ -3166 +3170 @@
         p = Post.objects.create(title="I worked on readonly_fields", 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",