Django/django
11
0
Fork 0
Code Pull Requests Projects Releases Activity

[1.8.x] Fixed #25206 -- Fixed error message when checking a ModelAdmin fieldset's fields.

Browse Source 
Backport of 8972818289452d611d97fac0f4a6d24625987b31 from master
This commit is contained in:
Alasdair Nicol 2015-08-01 22:32:51 +01:00 committed by Tim Graham
parent f32bb3adf0
commit 7a8460191e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/contrib/admin/checks.py
View File

@ -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)):

8
tests/admin_checks/tests.py
View File

@ -126,7 +126,7 @@ class SystemChecksTestCase(TestCase):
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"]
@ -140,7 +140,7 @@ class SystemChecksTestCase(TestCase):
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',
@ -150,7 +150,7 @@ class SystemChecksTestCase(TestCase):
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 = [
@ -165,7 +165,7 @@ class SystemChecksTestCase(TestCase):
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',