diff options
| author | Tim Graham <timograham@gmail.com> | 2015-08-24 11:52:58 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-08-28 09:03:34 -0400 |
| commit | 3cc67a637a3cd1426d2ac87d7418600fa247ebb2 (patch) | |
| tree | f28b96aee6830482ee067f58f85b8212577a69b9 /tests/admin_views/admin.py | |
| parent | 4f83bfa9e5ef10c6c9711ad529630d09a06ef413 (diff) | |
[1.8.x] Fixed #25299 -- Fixed crash with ModelAdmin.list_display value that clashes with a model reverse accessor.
Backport of 9607a0404188bbe612f05216f5a82df26f4b4e80 from master
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 158f42ea67..b4e67f0a23 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): |