mirror of
https://github.com/django/django.git
synced 2025-06-05 03:29:12 +00:00
Fixed #25206 -- Fixed error message when checking a ModelAdmin fieldset's fields.
This commit is contained in:
parent
a6acfc3183
commit
8972818289
@ -135,7 +135,7 @@ class BaseModelAdminChecks(object):
|
|||||||
)
|
)
|
||||||
]
|
]
|
||||||
elif not isinstance(fieldset[1]['fields'], (list, tuple)):
|
elif not isinstance(fieldset[1]['fields'], (list, tuple)):
|
||||||
return must_be('a list or tuple', option="fieldsets[1]['fields']", obj=cls, id='admin.E008')
|
return must_be('a list or tuple', option="%s[1]['fields']" % label, obj=cls, id='admin.E008')
|
||||||
|
|
||||||
fields = flatten(fieldset[1]['fields'])
|
fields = flatten(fieldset[1]['fields'])
|
||||||
if len(fields) != len(set(fields)):
|
if len(fields) != len(set(fields)):
|
||||||
|
@ -125,7 +125,7 @@ class SystemChecksTestCase(SimpleTestCase):
|
|||||||
|
|
||||||
def test_fieldsets_fields_non_tuple(self):
|
def test_fieldsets_fields_non_tuple(self):
|
||||||
"""
|
"""
|
||||||
Tests for a tuple/list within fieldsets[1]['fields'].
|
Tests for a tuple/list for the first fieldset's fields.
|
||||||
"""
|
"""
|
||||||
class NotATupleAdmin(admin.ModelAdmin):
|
class NotATupleAdmin(admin.ModelAdmin):
|
||||||
list_display = ["pk", "title"]
|
list_display = ["pk", "title"]
|
||||||
@ -139,7 +139,7 @@ class SystemChecksTestCase(SimpleTestCase):
|
|||||||
errors = NotATupleAdmin.check(model=Song)
|
errors = NotATupleAdmin.check(model=Song)
|
||||||
expected = [
|
expected = [
|
||||||
checks.Error(
|
checks.Error(
|
||||||
"The value of 'fieldsets[1]['fields']' must be a list or tuple.",
|
"The value of 'fieldsets[0][1]['fields']' must be a list or tuple.",
|
||||||
hint=None,
|
hint=None,
|
||||||
obj=NotATupleAdmin,
|
obj=NotATupleAdmin,
|
||||||
id='admin.E008',
|
id='admin.E008',
|
||||||
@ -149,7 +149,7 @@ class SystemChecksTestCase(SimpleTestCase):
|
|||||||
|
|
||||||
def test_nonfirst_fieldset(self):
|
def test_nonfirst_fieldset(self):
|
||||||
"""
|
"""
|
||||||
Tests for a tuple/list within the second fieldsets[2]['fields'].
|
Tests for a tuple/list for the second fieldset's fields.
|
||||||
"""
|
"""
|
||||||
class NotATupleAdmin(admin.ModelAdmin):
|
class NotATupleAdmin(admin.ModelAdmin):
|
||||||
fieldsets = [
|
fieldsets = [
|
||||||
@ -164,7 +164,7 @@ class SystemChecksTestCase(SimpleTestCase):
|
|||||||
errors = NotATupleAdmin.check(model=Song)
|
errors = NotATupleAdmin.check(model=Song)
|
||||||
expected = [
|
expected = [
|
||||||
checks.Error(
|
checks.Error(
|
||||||
"The value of 'fieldsets[1]['fields']' must be a list or tuple.",
|
"The value of 'fieldsets[1][1]['fields']' must be a list or tuple.",
|
||||||
hint=None,
|
hint=None,
|
||||||
obj=NotATupleAdmin,
|
obj=NotATupleAdmin,
|
||||||
id='admin.E008',
|
id='admin.E008',
|
||||||
|
Loading…
x
Reference in New Issue
Block a user