diff options
| author | Alasdair Nicol <alasdair@thenicols.net> | 2016-02-29 11:12:25 +0000 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2016-03-01 08:20:14 -0500 |
| commit | 65bd053f11d22bca529f1da895599796fa0f3ee1 (patch) | |
| tree | 12605b392ed07b96420cf1f4cc49bc6a37e9925d /django | |
| parent | 0223e213dd690b6b6e0669f836a20efb10998c83 (diff) | |
Fixed #26229 -- Improved check for model admin check admin.E124
Refs #22792
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/admin/checks.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/django/contrib/admin/checks.py b/django/contrib/admin/checks.py index 4bf548223d..47e40d62ab 100644 --- a/django/contrib/admin/checks.py +++ b/django/contrib/admin/checks.py @@ -806,10 +806,10 @@ class ModelAdminChecks(BaseModelAdminChecks): id='admin.E123', ) ] - # Check that list_display_links is set, and that the first values of list_editable and list_display are - # not the same. See ticket #22792 for the use case relating to this. - elif (obj.list_display[0] in obj.list_editable and obj.list_display[0] != obj.list_editable[0] and - obj.list_display_links is not None): + # If list_display[0] is in list_editable, check that + # list_display_links is set. See #22792 and #26229 for use cases. + elif (obj.list_display[0] == field_name and not obj.list_display_links + and obj.list_display_links is not None): return [ checks.Error( "The value of '%s' refers to the first field in 'list_display' ('%s'), " |