Changeset 5065

Timestamp:

04/24/07 07:53:29 (1 year ago)

Author:

russellm

Message:

Fixed #3870, Refs #3787 -- Fixed handling of widget attributes on RadioSelect? and MultiWidget?. In particular, handling of the id attribute has been fixed. Thanks to Gary Wilson and Max Derkachev.

Files:

• django/trunk/django/newforms/widgets.py (modified) (2 diffs)
• django/trunk/tests/regressiontests/forms/tests.py (modified) (2 diffs)

django/trunk/django/newforms/widgets.py

@@ -261 +261 @@
-        if value is None: value = ''
-        str_value = smart_unicode(value) # Normalize to string.
-attrs = attrs or {}
-
+final_attrs = self.build_attrs(attrs)
+final_
-
-    def id_for_label(self, id_):
@@ -328 +328 @@
-            value = self.decompress(value)
-        output = []
+        final_attrs = self.build_attrs(attrs)
+        id_ = final_attrs.get('id', None)
-        for i, widget in enumerate(self.widgets):
-            try:
-                widget_value = value[i]
-Key
+Index
-                widget_value = None
-
+
+
+
-        return self.format_output(output)
+
+    def id_for_label(self, id_):
+        # See the comment for RadioSelect.id_for_label()
+        if id_:
+            id_ += '_0'
+        return id_
+    id_for_label = classmethod(id_for_label)
-
-    def value_from_datadict(self, data, name):

django/trunk/tests/regressiontests/forms/tests.py

@@ -659 +659 @@
-IndexError: list index out of range
-
+# Unicode choices are correctly rendered as HTML
->>> w = RadioSelect()
->>> unicode(w.render('email', 'ŠĐĆŜćşšđ', choices=[('ŠĐĆŜćşšđ', 'ŠĐabcĆŜćşšđ'), ('ćşšđ', 'abcćşšđ')]))
-u'<ul>\n<li><label><input checked="checked" type="radio" name="email" value="\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111" /> \u0160\u0110abc\u0106\u017d\u0107\u017e\u0161\u0111</label></li>\n<li><label><input type="radio" name="email" value="\u0107\u017e\u0161\u0111" /> abc\u0107\u017e\u0161\u0111</label></li>\n</ul>'
+
+# Attributes provided at instantiation are passed to the constituent inputs
+>>> w = RadioSelect(attrs={'id':'foo'})
+>>> print w.render('beatle', 'J', choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo')))
+<ul>
+<li><label><input checked="checked" type="radio" id="foo_0" value="J" name="beatle" /> John</label></li>
+<li><label><input type="radio" id="foo_1" value="P" name="beatle" /> Paul</label></li>
+<li><label><input type="radio" id="foo_2" value="G" name="beatle" /> George</label></li>
+<li><label><input type="radio" id="foo_3" value="R" name="beatle" /> Ringo</label></li>
+</ul>
+
+# Attributes provided at render-time are passed to the constituent inputs
+>>> w = RadioSelect()
+>>> print w.render('beatle', 'J', choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo')), attrs={'id':'bar'})
+<ul>
+<li><label><input checked="checked" type="radio" id="bar_0" value="J" name="beatle" /> John</label></li>
+<li><label><input type="radio" id="bar_1" value="P" name="beatle" /> Paul</label></li>
+<li><label><input type="radio" id="bar_2" value="G" name="beatle" /> George</label></li>
+<li><label><input type="radio" id="bar_3" value="R" name="beatle" /> Ringo</label></li>
+</ul>
-
-# CheckboxSelectMultiple Widget ###############################################
@@ -784 +805 @@
->>> w.render('name', 'john__lennon')
-u'<input type="text" class="big" value="john" name="name_0" /><br /><input type="text" class="small" value="lennon" name="name_1" />'
+>>> w.render('name', 'john__lennon', attrs={'id':'foo'})
+u'<input id="foo_0" type="text" class="big" value="john" name="name_0" /><br /><input id="foo_1" type="text" class="small" value="lennon" name="name_1" />'
+>>> w = MyMultiWidget(widgets=(TextInput(attrs={'class': 'big'}), TextInput(attrs={'class': 'small'})), attrs={'id': 'bar'})
+>>> w.render('name', ['john', 'lennon'])
+u'<input id="bar_0" type="text" class="big" value="john" name="name_0" /><br /><input id="bar_1" type="text" class="small" value="lennon" name="name_1" />'
-
-# SplitDateTimeWidget #########################################################