mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-22 04:35:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed #22950 -- Eased markup customization for choice field rendering

Browse source 
Thanks Patrick Robertson for the report.
This commit is contained in:
Claude Paroz 2014-07-04 13:53:01 +02:00
parent 9209049211
commit dd9a23d5cf
2 changed files with 68 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

17
django/forms/widgets.py
View file

@ -643,6 +643,8 @@ class ChoiceFieldRenderer(object):
"""
choice_input_class = None
outer_html = '<ul{id_attr}>{content}</ul>'
inner_html = '<li>{choice_value}{sub_widgets}</li>'
def __init__(self, name, value, attrs, choices):
self.name = name
@ -664,8 +666,7 @@ class ChoiceFieldRenderer(object):
item in the list will get an id of `$id_$i`).
"""
id_ = self.attrs.get('id', None)
start_tag = format_html('<ul id="{0}">', id_) if id_ else '<ul>'
output = [start_tag]
output = []
for i, choice in enumerate(self.choices):
choice_value, choice_label = choice
if isinstance(choice_label, (tuple, list)):
@ -677,14 +678,16 @@ class ChoiceFieldRenderer(object):
attrs=attrs_plus,
choices=choice_label)
sub_ul_renderer.choice_input_class = self.choice_input_class
output.append(format_html('<li>{0}{1}</li>', choice_value,
sub_ul_renderer.render()))
output.append(format_html(self.inner_html, choice_value=choice_value,
sub_widgets=sub_ul_renderer.render()))
else:
w = self.choice_input_class(self.name, self.value,
self.attrs.copy(), choice, i)
output.append(format_html('<li>{0}</li>', force_text(w)))
output.append('</ul>')
return mark_safe('\n'.join(output))
output.append(format_html(self.inner_html,
choice_value=force_text(w), sub_widgets=''))
return format_html(self.outer_html,
id_attr=format_html(' id="{0}"', id_) if id_ else '',
content=mark_safe('\n'.join(output)))
class RadioFieldRenderer(ChoiceFieldRenderer):