Commit 18374c1d authored by Claude Paroz's avatar Claude Paroz
Browse files

Fixed #21752 -- Prevented custom widget step attribute to be overwritten 

Thanks orcein at gmail.com for the report.
parent f7c2c0a3

django/forms/fields.py

+2 −2
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ class FloatField(IntegerField): 


    def widget_attrs(self, widget):

        attrs = super(FloatField, self).widget_attrs(widget)

        if isinstance(widget, NumberInput):

        if isinstance(widget, NumberInput) and 'step' not in widget.attrs:

            attrs.setdefault('step', 'any')

        return attrs
@@ -377,7 +377,7 @@ class DecimalField(IntegerField): 


    def widget_attrs(self, widget):

        attrs = super(DecimalField, self).widget_attrs(widget)

        if isinstance(widget, NumberInput):

        if isinstance(widget, NumberInput) and 'step' not in widget.attrs:

            if self.decimal_places is not None:

                # Use exponential notation for small values since they might

                # be parsed as 0 otherwise. ref #20765

tests/forms_tests/tests/test_fields.py

+6 −0
Original line number Diff line number Diff line
@@ -282,6 +282,10 @@ class FieldsTests(SimpleTestCase): 
        self.assertEqual(f.max_value, 1.5)

        self.assertEqual(f.min_value, 0.5)



    def test_floatfield_widget_attrs(self):

        f = FloatField(widget=NumberInput(attrs={'step': 0.01, 'max': 1.0, 'min': 0.0}))

        self.assertWidgetRendersTo(f, '<input step="0.01" name="f" min="0.0" max="1.0" type="number" id="id_f" />')



    def test_floatfield_localized(self):

        """

        Make sure localized FloatField's widget renders to a text input with
@@ -392,6 +396,8 @@ class FieldsTests(SimpleTestCase): 
        self.assertEqual(f.widget_attrs(NumberInput()), {'step': '1e-19'})

        f = DecimalField(max_digits=20)

        self.assertEqual(f.widget_attrs(NumberInput()), {'step': 'any'})

        f = DecimalField(max_digits=6, widget=NumberInput(attrs={'step': '0.01'}))

        self.assertWidgetRendersTo(f, '<input step="0.01" name="f" type="number" id="id_f" />')



    def test_decimalfield_localized(self):

        """