diff options
| author | Fabrizio Ettore Messina <zauddelig@gmail.com> | 2015-08-13 10:03:20 +0200 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-08-13 12:34:48 -0400 |
| commit | ece78684d9e09c477c4a0f10236c0aec45bac726 (patch) | |
| tree | 2ae7d78c9fa4cf640db233fb0e2fc42c4460f20f | |
| parent | 0cc059cd104cdb70340bd08e597d403d80dc42a6 (diff) | |
Fixed #25267 -- Corrected message for admin.E122 system check.
| -rw-r--r-- | django/contrib/admin/checks.py | 11 | ||||
| -rw-r--r-- | tests/admin_checks/tests.py | 16 |
2 files changed, 25 insertions, 2 deletions
diff --git a/django/contrib/admin/checks.py b/django/contrib/admin/checks.py index c74e8b96c2..62cce24af6 100644 --- a/django/contrib/admin/checks.py +++ b/django/contrib/admin/checks.py @@ -774,8 +774,15 @@ class ModelAdminChecks(BaseModelAdminChecks): model=model, obj=cls, id='admin.E121') else: if field_name not in cls.list_display: - return refer_to_missing_field(field=field_name, option=label, - model=model, obj=cls, id='admin.E122') + return [ + checks.Error( + "The value of '%s' refers to '%s', which is not " + "contained in 'list_display'." % (label, field_name), + hint=None, + obj=cls, + id='admin.E122', + ) + ] elif cls.list_display_links and field_name in cls.list_display_links: return [ checks.Error( diff --git a/tests/admin_checks/tests.py b/tests/admin_checks/tests.py index 0b4d905c1b..84f4439fe2 100644 --- a/tests/admin_checks/tests.py +++ b/tests/admin_checks/tests.py @@ -69,6 +69,22 @@ class SystemChecksTestCase(SimpleTestCase): custom_site.unregister(Song) admin.sites.system_check_errors = [] + def test_field_name_not_in_list_display(self): + class SongAdmin(admin.ModelAdmin): + list_editable = ["original_release"] + + errors = SongAdmin.check(model=Song) + expected = [ + checks.Error( + "The value of 'list_editable[0]' refers to 'original_release', " + "which is not contained in 'list_display'.", + hint=None, + obj=SongAdmin, + id='admin.E122', + ) + ] + self.assertEqual(errors, expected) + def test_readonly_and_editable(self): class SongAdmin(admin.ModelAdmin): readonly_fields = ["original_release"] |