Commit 7a846019 authored by Alasdair Nicol's avatar Alasdair Nicol Committed by Tim Graham
Browse files

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

Backport of 89728182 from master
parent f32bb3ad

django/contrib/admin/checks.py

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ class BaseModelAdminChecks(object): 
                )

            ]

        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'])

        if len(fields) != len(set(fields)):

tests/admin_checks/tests.py

+4 −4
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ class SystemChecksTestCase(TestCase): 


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

            list_display = ["pk", "title"]
@@ -140,7 +140,7 @@ class SystemChecksTestCase(TestCase): 
        errors = NotATupleAdmin.check(model=Song)

        expected = [

            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,

                obj=NotATupleAdmin,

                id='admin.E008',
@@ -150,7 +150,7 @@ class SystemChecksTestCase(TestCase): 


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

            fieldsets = [
@@ -165,7 +165,7 @@ class SystemChecksTestCase(TestCase): 
        errors = NotATupleAdmin.check(model=Song)

        expected = [

            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,

                obj=NotATupleAdmin,

                id='admin.E008',