Commit 62f842e2 authored by Loic Raucy's avatar Loic Raucy Committed by Preston Holmes
Browse files

Fixed #19581 -- ensure unique html ids with CheckboxSelectMultiple widgets 

ID check is now done the same way as MultipleHiddenInput.
parent 227bd3f8

django/forms/widgets.py

+4 −4
Original line number Diff line number Diff line
@@ -754,17 +754,17 @@ class RadioSelect(Select): 
class CheckboxSelectMultiple(SelectMultiple):

    def render(self, name, value, attrs=None, choices=()):

        if value is None: value = []

        has_id = attrs and 'id' in attrs

        final_attrs = self.build_attrs(attrs, name=name)

        id_ = final_attrs.get('id', None)

        output = ['<ul>']

        # Normalize to strings

        str_values = set([force_text(v) for v in value])

        for i, (option_value, option_label) in enumerate(chain(self.choices, choices)):

            # If an ID attribute was given, add a numeric index as a suffix,

            # so that the checkboxes don't all have the same ID attribute.

            if has_id:

                final_attrs = dict(final_attrs, id='%s_%s' % (attrs['id'], i))

                label_for = format_html(' for="{0}"', final_attrs['id'])

            if id_:

                final_attrs = dict(final_attrs, id='%s_%s' % (id_, i))

                label_for = format_html(' for="{0}_{1}"', id_, i)

            else:

                label_for = ''

tests/regressiontests/forms/tests/widgets.py

+7 −0
Original line number Diff line number Diff line
@@ -861,6 +861,13 @@ beatle J R Ringo False""") 
<li><label for="abc_0"><input checked="checked" type="checkbox" name="letters" value="a" id="abc_0" /> A</label></li>

<li><label for="abc_1"><input type="checkbox" name="letters" value="b" id="abc_1" /> B</label></li>

<li><label for="abc_2"><input checked="checked" type="checkbox" name="letters" value="c" id="abc_2" /> C</label></li>

</ul>""")



        # Each input gets a separate ID when the ID is passed to the constructor

        self.assertHTMLEqual(CheckboxSelectMultiple(attrs={'id': 'abc'}).render('letters', list('ac'), choices=zip(list('abc'), list('ABC'))), """<ul>

<li><label for="abc_0"><input checked="checked" type="checkbox" name="letters" value="a" id="abc_0" /> A</label></li>

<li><label for="abc_1"><input type="checkbox" name="letters" value="b" id="abc_1" /> B</label></li>

<li><label for="abc_2"><input checked="checked" type="checkbox" name="letters" value="c" id="abc_2" /> C</label></li>

</ul>""")



    def test_multi(self):