summaryrefslogtreecommitdiff
path: root/tests/admin_views/admin.py
diff options
context:
space:
mode:
authorAlexander Gaevsky <sasha@sasha0.ru>2015-12-24 23:32:53 +0200
committerTim Graham <timograham@gmail.com>2015-12-29 19:56:23 -0500
commit83174866ac462e91913923e2368c23633a451f06 (patch)
treef8224da4617dd6678d7a3b0a7733d5426c1a9d62 /tests/admin_views/admin.py
parentbd746ae341009215d5f5832d83b27c798fc63254 (diff)
[1.8.x] Fixed #25465 -- Restored line breaks conversion in admin readonly fields.
Backport of 69208a5a1c55d42ca0eaffa900be643d9f801089 from master
Diffstat (limited to 'tests/admin_views/admin.py')
-rw-r--r--tests/admin_views/admin.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/admin_views/admin.py b/tests/admin_views/admin.py
index 3cd3b6147c..7a6b25b519 100644
--- a/tests/admin_views/admin.py
+++ b/tests/admin_views/admin.py
@@ -382,7 +382,7 @@ class LinkInline(admin.TabularInline):
model = Link
extra = 1
- readonly_fields = ("posted", "multiline")
+ readonly_fields = ("posted", "multiline", "readonly_link_content")
def multiline(self, instance):
return "InlineMultiline\ntest\nstring"
@@ -429,7 +429,7 @@ class PostAdmin(admin.ModelAdmin):
list_display = ['title', 'public']
readonly_fields = (
'posted', 'awesomeness_level', 'coolness', 'value',
- 'multiline', 'multiline_html', lambda obj: "foo"
+ 'multiline', 'multiline_html', lambda obj: "foo", 'readonly_content',
)
inlines = [