Ticket #4003: SelectWTitle.diff

fields.py

@@ -357 +357 @@
         value = smart_unicode(value)
         if value == u'':
             return value
-        valid_values = set([str(k) for k, v in self.choices])
+        valid_values = set([str(choice[0]) for choice in self.choices])
         if value not in valid_values:
             raise ValidationError(gettext(u'Select a valid choice. That choice is not one of the available choices.'))
         return value

widgets.py

@@ -172 +172 @@
         output.append(u'</select>')
         return u'\n'.join(output)
 
+class SelectWTitle(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 option_value, option_label, option_title in chain(self.choices, choices):
+            option_value = smart_unicode(option_value)
+            selected_html = (option_value == str_value) and u' selected="selected"' or ''
+            output.append(u'<option value="%s"%s title="%s">%s</option>' % (escape(option_value), selected_html, escape(smart_unicode(option_title)), escape(smart_unicode(option_label))))
+        output.append(u'</select>')
+        return u'\n'.join(output)
+
 class NullBooleanSelect(Select):
     """
     A Select Widget intended to be used with NullBooleanField.