summaryrefslogtreecommitdiff
path: root/tests/admin_views/admin.py
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2013-08-29 09:39:31 -0400
committerTim Graham <timograham@gmail.com>2013-08-29 09:45:02 -0400
commitef1259342b46cd4b63678a4acddf2a2b631d342c (patch)
treec4039f15e8349cafd7262011586faf67b7255868 /tests/admin_views/admin.py
parent58157be5ad31b42a1dc73e357cfdece02fd0b6ee (diff)
[1.6.x] Fixed #16433 -- Fixed a help_text/read only field interaction that caused an admin crash.
Thanks chris at cogdon.org for the report and admackin for the patch. Backport of af953c45cc from master
Diffstat (limited to 'tests/admin_views/admin.py')
-rw-r--r--tests/admin_views/admin.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/admin_views/admin.py b/tests/admin_views/admin.py
index 039abb819b..b31c5b59e4 100644
--- a/tests/admin_views/admin.py
+++ b/tests/admin_views/admin.py
@@ -450,6 +450,10 @@ class GadgetAdmin(admin.ModelAdmin):
return CustomChangeList
+class ToppingAdmin(admin.ModelAdmin):
+ readonly_fields = ('pizzas',)
+
+
class PizzaAdmin(admin.ModelAdmin):
readonly_fields = ('toppings',)
@@ -755,7 +759,7 @@ site.register(Book, inlines=[ChapterInline])
site.register(Promo)
site.register(ChapterXtra1, ChapterXtra1Admin)
site.register(Pizza, PizzaAdmin)
-site.register(Topping)
+site.register(Topping, ToppingAdmin)
site.register(Album, AlbumAdmin)
site.register(Question)
site.register(Answer)