diff --git a/django/forms/widgets.py b/django/forms/widgets.py index 9b95c31c92..3797c163bd 100644 --- a/django/forms/widgets.py +++ b/django/forms/widgets.py @@ -499,6 +499,8 @@ class CheckboxInput(Widget): return bool(initial) != bool(data) class Select(Widget): + allow_multiple_selected = False + def __init__(self, attrs=None, choices=()): super(Select, self).__init__(attrs) # choices can be any iterable, but we may need to render this widget @@ -518,14 +520,20 @@ class Select(Widget): def render_option(self, selected_choices, option_value, option_label): option_value = force_unicode(option_value) - selected_html = (option_value in selected_choices) and u' selected="selected"' or '' + if option_value in selected_choices: + selected_html = u' selected="selected"' + if not self.allow_multiple_selected: + # Only allow for a single selection. + selected_choices.remove(option_value) + else: + selected_html = '' return u'' % ( escape(option_value), selected_html, conditional_escape(force_unicode(option_label))) def render_options(self, choices, selected_choices): # Normalize to strings. - selected_choices = set([force_unicode(v) for v in selected_choices]) + selected_choices = set(force_unicode(v) for v in selected_choices) output = [] for option_value, option_label in chain(self.choices, choices): if isinstance(option_label, (list, tuple)): @@ -571,6 +579,8 @@ class NullBooleanSelect(Select): return initial != data class SelectMultiple(Select): + allow_multiple_selected = True + def render(self, name, value, attrs=None, choices=()): if value is None: value = [] final_attrs = self.build_attrs(attrs, name=name) diff --git a/tests/regressiontests/forms/tests/widgets.py b/tests/regressiontests/forms/tests/widgets.py index b4ceb2fcff..e6667f7629 100644 --- a/tests/regressiontests/forms/tests/widgets.py +++ b/tests/regressiontests/forms/tests/widgets.py @@ -12,7 +12,6 @@ from django.utils.translation import activate, deactivate from django.utils.unittest import TestCase - class FormsWidgetTestCase(TestCase): # Each Widget class corresponds to an HTML form widget. A Widget knows how to # render itself, given a field name and some data. Widgets don't perform @@ -255,6 +254,15 @@ class FormsWidgetTestCase(TestCase): +""") + + # Only one option can be selected, see #8103: + self.assertEqual(w.render('choices', '0', choices=(('0', '0'), ('1', '1'), ('2', '2'), ('3', '3'), ('0', 'extra'))), """""") # The value is compared to its str(): @@ -438,6 +446,15 @@ class FormsWidgetTestCase(TestCase): +""") + + # Multiple options (with the same value) can be selected, see #8103: + self.assertEqual(w.render('choices', ['0'], choices=(('0', '0'), ('1', '1'), ('2', '2'), ('3', '3'), ('0', 'extra'))), """""") # If multiple values are given, but some of them are not valid, the valid ones are selected: