innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

[1.11.x] Fixed #28059 -- Restored class attribute in <ul> of widgets that use multiple_input.html. 

Regression in b52c73008a

Backport of af1f986360 from master
This commit is contained in:
Tim Graham 2017-04-15 13:55:33 -04:00
parent e6bfd3d751
commit 2f358d32ec
4 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/forms/jinja2/django/forms/widgets/multiple_input.html
View File

@ -1,4 +1,4 @@
{% set id = widget.attrs.id %}<ul{% if id %} id="{{ id }}"{% endif %}>{% for group, options, index in widget.optgroups %}{% if group %}
{% set id = widget.attrs.id %}<ul{% if id %} id="{{ id }}"{% endif %}{% if widget.attrs.class %} class="{{ widget.attrs.class }}"{% endif %}>{% for group, options, index in widget.optgroups %}{% if group %}
<li>{{ group }}<ul{% if id %} id="{{ id }}_{{ index }}"{% endif %}>{% endif %}{% for widget in options %}
<li>{% include widget.template_name %}</li>{% endfor %}{% if group %}
</ul></li>{% endif %}{% endfor %}

2
django/forms/templates/django/forms/widgets/multiple_input.html
View File

@ -1,4 +1,4 @@
{% with id=widget.attrs.id %}<ul{% if id %} id="{{ id }}"{% endif %}>{% for group, options, index in widget.optgroups %}{% if group %}
{% with id=widget.attrs.id %}<ul{% if id %} id="{{ id }}"{% endif %}{% if widget.attrs.class %} class="{{ widget.attrs.class }}"{% endif %}>{% for group, options, index in widget.optgroups %}{% if group %}
<li>{{ group }}<ul{% if id %} id="{{ id }}_{{ index }}"{% endif %}>{% endif %}{% for option in options %}
<li>{% include option.template_name with widget=option %}</li>{% endfor %}{% if group %}
</ul></li>{% endif %}{% endfor %}

4
docs/releases/1.11.1.txt
View File

@ -36,3 +36,7 @@ Bugfixes
* Allowed prefetch calls on managers with custom ``ModelIterable`` subclasses
(:ticket:`28096`).
* Restored the output of the ``class`` attribute in the ``<ul>`` of widgets
that use the ``multiple_input.html`` template. This fixes
``ModelAdmin.radio_fields`` with ``admin.HORIZONTAL`` (:ticket:`28059`).

15
tests/forms_tests/widget_tests/test_radioselect.py
View File

@ -84,3 +84,18 @@ class RadioSelectTest(WidgetTest):
</ul>
"""
self.check_html(self.widget(choices=self.beatles), 'beatle', 'J', attrs={'id': 'bar'}, html=html)
def test_class_attrs(self):
"""
The <ul> in the multiple_input.html widget template include the class
attribute.
"""
html = """
<ul class="bar">
<li><label><input checked type="radio" class="bar" value="J" name="beatle" /> John</label></li>
<li><label><input type="radio" class="bar" value="P" name="beatle" /> Paul</label></li>
<li><label><input type="radio" class="bar" value="G" name="beatle" /> George</label></li>
<li><label><input type="radio" class="bar" value="R" name="beatle" /> Ringo</label></li>
</ul>
"""
self.check_html(self.widget(choices=self.beatles), 'beatle', 'J', attrs={'class': 'bar'}, html=html)