Changeset 4136

Timestamp:

11/29/06 11:00:34 (2 years ago)

Author:

adrian

Message:

newforms: Added Widget.value_from_datadict hook, which allows a Widget to define how to convert its post data dictionary to a value. Implemented it for CheckboxSelectMultiple? and updated unit tests

Files:

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

django/trunk/django/newforms/forms.py

@@ -119 +119 @@
-            return
-        for name, field in self.fields.items():
-
+
+
+
+
-            try:
-                value = field.clean(value)

django/trunk/django/newforms/widgets.py

@@ -36 +36 @@
-            attrs.update(extra_attrs)
-        return attrs
+
+    def value_from_datadict(self, data, name):
+        """
+        Given a dictionary of data and this widget's name, returns the value
+        of this widget. Returns None if it's not provided.
+        """
+        return data.get(name, None)
-
-    def id_for_label(self, id_):
@@ -187 +194 @@
-        for option_value, option_label in chain(self.choices, choices):
-            option_value = smart_unicode(option_value)
-unicode(name + option_value)
+name + option_value
-            rendered_cb = cb.render(field_name, (option_value in str_values))
-            output.append(u'<li><label>%s %s</label></li>' % (rendered_cb, escape(smart_unicode(option_label))))
-        output.append(u'</ul>')
-        return u'\n'.join(output)
+
+    def value_from_datadict(self, data, name):
+        data_list = [k for k, v in self.choices if data.get(name + k)]
+        return data_list or None
-
-    def id_for_label(self, id_):

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

@@ -1472 +1472 @@
-</select>
-
+Add widget=RadioSelect to use that widget with a ChoiceField.
->>> class FrameworkForm(Form):
-...     name = CharField()
@@ -1545 +1546 @@
-<option value="P" selected="selected">Paul McCartney</option>
-</select>
+
+MultipleChoiceField can also be used with the CheckboxSelectMultiple widget.
+>>> class SongForm(Form):
+...     name = CharField()
+...     composers = MultipleChoiceField(choices=[('J', 'John Lennon'), ('P', 'Paul McCartney')], widget=CheckboxSelectMultiple)
+>>> f = SongForm()
+>>> print f['composers']
+<ul>
+<li><label><input type="checkbox" name="composersJ" /> John Lennon</label></li>
+<li><label><input type="checkbox" name="composersP" /> Paul McCartney</label></li>
+</ul>
+>>> f = SongForm({'composers': ['J']})
+>>> print f['composers']
+<ul>
+<li><label><input checked="checked" type="checkbox" name="composersJ" /> John Lennon</label></li>
+<li><label><input type="checkbox" name="composersP" /> Paul McCartney</label></li>
+</ul>
+>>> f = SongForm({'composers': ['J', 'P']})
+>>> print f['composers']
+<ul>
+<li><label><input checked="checked" type="checkbox" name="composersJ" /> John Lennon</label></li>
+<li><label><input checked="checked" type="checkbox" name="composersP" /> Paul McCartney</label></li>
+</ul>
+
+When using CheckboxSelectMultiple, the framework automatically converts the
+data in clean_data to a list of values, rather than the underlying HTML form
+field name.
+>>> f = SongForm({'name': 'Yesterday'})
+>>> f.errors
+{'composers': [u'This field is required.']}
+>>> f = SongForm({'name': 'Yesterday', 'composersJ': 'on'})
+>>> f.errors
+{}
+>>> f.clean_data
+{'composers': [u'J'], 'name': u'Yesterday'}
+>>> f = SongForm({'name': 'Yesterday', 'composersJ': 'on', 'composersP': 'on'})
+>>> f.errors
+{}
+>>> f.clean_data
+{'composers': [u'J', u'P'], 'name': u'Yesterday'}
-
-There are a couple of ways to do multiple-field validation. If you want the