Commit 80708ac7 authored by Simon Charette's avatar Simon Charette
Browse files

Fixed #23113 -- ChoiceInput.render should take specified attrs into account. 

Thanks to Tim Graham for the review.
parent 729e4ae4

django/forms/widgets.py

+7 −3
Original line number Diff line number Diff line
@@ -601,13 +601,17 @@ class ChoiceInput(SubWidget): 
            label_for = format_html(' for="{0}"', self.id_for_label)

        else:

            label_for = ''

        return format_html('<label{0}>{1} {2}</label>', label_for, self.tag(), self.choice_label)

        attrs = dict(self.attrs, **attrs) if attrs else self.attrs

        return format_html(

            '<label{0}>{1} {2}</label>', label_for, self.tag(attrs), self.choice_label

        )



    def is_checked(self):

        return self.value == self.choice_value



    def tag(self):

        final_attrs = dict(self.attrs, type=self.input_type, name=self.name, value=self.choice_value)

    def tag(self, attrs=None):

        attrs = attrs or self.attrs

        final_attrs = dict(attrs, type=self.input_type, name=self.name, value=self.choice_value)

        if self.is_checked():

            final_attrs['checked'] = 'checked'

        return format_html('<input{0} />', flatatt(final_attrs))

tests/forms_tests/tests/test_widgets.py

+6 −0
Original line number Diff line number Diff line
@@ -687,6 +687,12 @@ beatle J R Ringo False""") 
        self.assertFalse(r[1].is_checked())

        self.assertEqual((r[1].name, r[1].value, r[1].choice_value, r[1].choice_label), ('beatle', 'J', 'P', 'Paul'))



        # These individual widgets can accept extra attributes if manually rendered.

        self.assertHTMLEqual(

            r[1].render(attrs={'extra': 'value'}),

            '<label><input type="radio" extra="value" name="beatle" value="P" /> Paul</label>'

        )



        with self.assertRaises(IndexError):

            r[10]