Commit e8c76891 authored by Joseph Kocherhans's avatar Joseph Kocherhans
Browse files

[1.1.X] Fixed #12913. Fields with choices now respect show_hidden_initial as a... 

[1.1.X] Fixed #12913. Fields with choices now respect show_hidden_initial as a keyword argument to formfield. Backport of r12696 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12697 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 8a8366d2

django/db/models/fields/__init__.py

+1 −1
Original line number Diff line number Diff line
@@ -339,7 +339,7 @@ class Field(object): 
            for k in kwargs.keys():

                if k not in ('coerce', 'empty_value', 'choices', 'required',

                             'widget', 'label', 'initial', 'help_text',

                             'error_messages'):

                             'error_messages', 'show_hidden_initial'):

                    del kwargs[k]

        defaults.update(kwargs)

        return form_class(**defaults)

tests/regressiontests/model_fields/tests.py

+14 −0
Original line number Diff line number Diff line
@@ -26,6 +26,20 @@ if Image: 
            TwoImageFieldTests





class BasicFieldTests(django.test.TestCase):

    def test_show_hidden_initial(self):

        """

        Regression test for #12913. Make sure fields with choices respect

        show_hidden_initial as a kwarg to models.Field.formfield()

        """

        choices = [(0, 0), (1, 1)]

        model_field = models.Field(choices=choices)

        form_field = model_field.formfield(show_hidden_initial=True)

        self.assertTrue(form_field.show_hidden_initial)



        form_field = model_field.formfield(show_hidden_initial=False)

        self.assertFalse(form_field.show_hidden_initial)



class DecimalFieldTests(django.test.TestCase):

    def test_to_python(self):

        f = models.DecimalField(max_digits=4, decimal_places=2)