Ticket #3262: newforms-widgets.2.diff

django/newforms/widgets.py

@@ -144 +144 @@
         output.append(u'</select>')
         return u'\n'.join(output)
 
+class SelectGrouped(Select):
+    def render(self, name, value, attrs=None, choices=()):
+        if value is None: value = ''
+        final_attrs = self.build_attrs(attrs, name=name)
+        output = [u'<select%s>' % flatatt(final_attrs)]
+        str_value = smart_unicode(value) # Normalize to string.
+        for group_label, group_choices in chain(self.choices, choices):
+            output.append(u'<optgroup label="%s">' % escape(smart_unicode(group_label)))
+            for option_value, option_label in group_choices:
+                option_value = smart_unicode(option_value)
+                option_label = smart_unicode(option_label)
+                selected_html = (option_value == str_value) and u' selected="selected"' or ''
+                output.append(u'<option value="%s"%s>%s</option>' % (escape(option_value), selected_html, escape(option_label)))
+            output.append(u'</optgroup>')
+        output.append(u'</select>')
+        return u'\n'.join(output)
+      
 class SelectMultiple(Widget):
     def __init__(self, attrs=None, choices=()):
         # choices can be any iterable
@@ -167 +184 @@
             return data.getlist(name)
         return data.get(name, None)
 
+class SelectMultipleGrouped(SelectMultiple):
+    def render(self, name, value, attrs=None, choices=()):
+        if value is None: value = []
+        final_attrs = self.build_attrs(attrs, name=name)
+        output = [u'<select multiple="multiple"%s>' % flatatt(final_attrs)]
+        str_values = set([smart_unicode(v) for v in value]) # Normalize to strings.
+        for group_label, group_choices in chain(self.choices, choices):
+            output.append(u'<optgroup label="%s">' % escape(smart_unicode(group_label)))
+            for option_value, option_label in group_choices:
+                option_value = smart_unicode(option_value)
+                option_label = smart_unicode(option_label)
+                selected_html = (option_value in str_values) and u' selected="selected"' or ''
+                output.append(u'<option value="%s"%s>%s</option>' % (escape(option_value), selected_html, escape(option_label)))
+            output.append(u'</optgroup>')
+        output.append(u'</select>')
+        return u'\n'.join(output)
+ 
 class RadioInput(StrAndUnicode):
     "An object used by RadioFieldRenderer that represents a single <input type='radio'>."
     def __init__(self, name, value, attrs, choice, index):