diff options
| author | Tim Graham <timograham@gmail.com> | 2015-08-24 11:52:58 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-08-28 08:46:26 -0400 |
| commit | 9607a0404188bbe612f05216f5a82df26f4b4e80 (patch) | |
| tree | 8f7424a7f42fa21950e4895e0eca201135dfc865 /tests/admin_views/admin.py | |
| parent | 8e631a3175f145dbf3eec269f8e3c59a1520540f (diff) | |
Fixed #25299 -- Fixed crash with ModelAdmin.list_display value that clashes with a model reverse accessor.
Diffstat (limited to 'tests/admin_views/admin.py')
| -rw-r--r-- | tests/admin_views/admin.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/admin_views/admin.py b/tests/admin_views/admin.py index 367ac3df62..b13bd32115 100644 --- a/tests/admin_views/admin.py +++ b/tests/admin_views/admin.py @@ -169,7 +169,11 @@ class ThingAdmin(admin.ModelAdmin): class InquisitionAdmin(admin.ModelAdmin): - list_display = ('leader', 'country', 'expected') + list_display = ('leader', 'country', 'expected', 'sketch') + + def sketch(self, obj): + # A method with the same name as a reverse accessor. + return 'list-display-sketch' class SketchAdmin(admin.ModelAdmin): |