Commit 1b6e7514 authored by Claude Paroz's avatar Claude Paroz
Browse files

[1.5.x] Fixed #19226 -- Applied linebreaksbr to read-only fields in admin 

Thanks shadow for the report, and Melevir and thiderman for the
patch.
Backport of ec9d6b11 from master.
parent a023952e

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

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
                    {% 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

+8 −1
Original line number Diff line number Diff line
@@ -388,7 +388,10 @@ class PrePopulatedPostAdmin(admin.ModelAdmin): 


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',

        lambda obj: "foo"

    )



    inlines = [

        LinkInline
@@ -402,6 +405,10 @@ class PostAdmin(admin.ModelAdmin): 


    def value(self, instance):

        return 1000



    def multiline(self, instance):

        return "Multiline\ntest\nstring"



    value.short_description = 'Value in $US'

tests/regressiontests/admin_views/tests.py

+4 −0
Original line number Diff line number Diff line
@@ -3149,6 +3149,10 @@ class ReadonlyTest(TestCase): 
        self.assertContains(response, "Very awesome.")

        self.assertContains(response, "Unkown coolness.")

        self.assertContains(response, "foo")



        # Checks that multiline text in a readonly field gets <br /> tags

        self.assertContains(response, "Multiline<br />test<br />string")



        self.assertContains(response,

            formats.localize(datetime.date.today() - datetime.timedelta(days=7))

        )