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:37:29 -0500
commit312e488a218a0c115cd23243b328dee5aee45965 (patch)
tree6af816d996f2d5cace588babe17eb92041b47db3 /tests/admin_views/admin.py
parent5f3c5e40b25f2b7ab1f42bfa0169fe40c35e97bb (diff)
[1.9.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 c2a2ccb352..90603ce828 100644
--- a/tests/admin_views/admin.py
+++ b/tests/admin_views/admin.py
@@ -387,7 +387,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"
@@ -435,7 +435,7 @@ class PostAdmin(admin.ModelAdmin):
readonly_fields = (
'posted', 'awesomeness_level', 'coolness', 'value',
'multiline', 'multiline_html', lambda obj: "foo",
- 'multiline_html_allow_tags',
+ 'multiline_html_allow_tags', 'readonly_content',
)
inlines = [