Ticket #7664: 7664.diff

django/forms/widgets.py

@@ -761 +761 @@
 
     You'll probably want to use this class with MultiValueField.
     """
-    def __init__(self, widgets, attrs=None):
+    def __init__(self, widgets, attrs=None, names=None):
         self.widgets = [isinstance(w, type) and w() or w for w in widgets]
+        self.names = names
+        if self.names:
+            if len(self.names) != len(self.widgets):
+                raise TypeError("The names argument for MultiWidget must be same length as the widgets list")
         super(MultiWidget, self).__init__(attrs)
 
     def render(self, name, value, attrs=None):
@@ -783 +787 @@
                 widget_value = None
             if id_:
                 final_attrs = dict(final_attrs, id='%s_%s' % (id_, i))
-            output.append(widget.render(name + '_%s' % i, widget_value, final_attrs))
+            widgetname = self.names and self.names[i] or i
+            output.append(widget.render(name + '_%s' % widgetname, widget_value, final_attrs))
         return mark_safe(self.format_output(output))
 
     def id_for_label(self, id_):
@@ -794 +799 @@
     id_for_label = classmethod(id_for_label)
 
     def value_from_datadict(self, data, files, name):
-        return [widget.value_from_datadict(data, files, name + '_%s' % i) for i, widget in enumerate(self.widgets)]
+        values = []
+        for i, widget in enumerate(self.widgets):
+            widgetname = self.names and selfnames[i] or i
+            values.append(widget.value_from_datadict(data, files, name + '_%s' % widgetname))
+        return values
 
     def _has_changed(self, initial, data):
         if initial is None:

tests/regressiontests/forms/tests/widgets.py

@@ -887 +887 @@
         # short circuiting while testing the widgets.
         self.assertTrue(w._has_changed(u'john__lennon', [u'john', u'denver']))
 
+        # with explicit names for subwidgets
+        w = MyMultiWidget(widgets=(TextInput(attrs={'class': 'big'}), TextInput(attrs={'class': 'small'})), names = ('big', 'small'))
+        self.assertEqual(w.render('name', ['john', 'lennon']), u'<input type="text" class="big" value="john" name="name_big" /><br /><input type="text" class="small" value="lennon" name="name_small" />')
+        self.assertEqual(w.render('name', 'john__lennon'), u'<input type="text" class="big" value="john" name="name_big" /><br /><input type="text" class="small" value="lennon" name="name_small" />')
+        self.assertEqual(w.render('name', 'john__lennon', attrs={'id':'foo'}), u'<input id="foo_0" type="text" class="big" value="john" name="name_big" /><br /><input id="foo_1" type="text" class="small" value="lennon" name="name_small" />')
+        w = MyMultiWidget(widgets=(TextInput(attrs={'class': 'big'}), TextInput(attrs={'class': 'small'})), attrs={'id': 'bar'}, names = ('big', 'small'))
+        self.assertEqual(w.render('name', ['john', 'lennon']), u'<input id="bar_0" type="text" class="big" value="john" name="name_big" /><br /><input id="bar_1" type="text" class="small" value="lennon" name="name_small" />')
+        self.assertRaises(TypeError, MyMultiWidget, widgets=(TextInput(), TextInput()), names=('big', 'middle', 'small'))
+
     def test_splitdatetime(self):
         w = SplitDateTimeWidget()
         self.assertEqual(w.render('date', ''), u'<input type="text" name="date_0" /><input type="text" name="date_1" />')