Changeset 4196

Timestamp:

12/13/06 00:26:04 (2 years ago)

Author:

adrian

Message:

Fixed #3114 -- newforms MultipleChoiceField? now handles MultiValueDicts? properly. Thanks for the patch, Honza Král

Files:

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

django/trunk/django/newforms/forms.py

@@ -3 +3 @@
-"""
-
-
+, MultiValueDict
-from django.utils.html import escape
-from fields import Field
@@ -222 +222 @@
-    def _data(self):
-        "Returns the data for this BoundField, or None if it wasn't given."
+        if self.field.widget.requires_data_list and isinstance(self.form.data, MultiValueDict):
+            return self.form.data.getlist(self.name)
-        return self.form.data.get(self.name, None)
-    data = property(_data)

django/trunk/django/newforms/widgets.py

@@ -10 +10 @@
-
-from util import StrAndUnicode, smart_unicode
+from django.utils.datastructures import MultiValueDict
-from django.utils.html import escape
-from itertools import chain
@@ -65 +66 @@
-    """
-    input_type = None # Subclasses must define this.
+
-    def render(self, name, value, attrs=None):
-        if value is None: value = ''
@@ -147 +149 @@
-        return u'\n'.join(output)
-
+    def value_from_datadict(self, data, name):
+        if isinstance(data, MultiValueDict):
+            return data.getlist(name)
+        return data.get(name, None)
+
-class RadioInput(StrAndUnicode):
-    "An object used by RadioFieldRenderer that represents a single <input type='radio'>."

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

@@ -1672 +1672 @@
-<li><label><input checked="checked" type="checkbox" name="composers" value="P" /> Paul McCartney</label></li>
-</ul>
+
+Data for a MultipleChoiceField should be a list. QueryDict and MultiValueDict
+conveniently work with this.
+>>> data = {'name': 'Yesterday', 'composers': ['J', 'P']}
+>>> f = SongForm(data)
+>>> f.errors
+{}
+>>> from django.http import QueryDict
+>>> data = QueryDict('name=Yesterday&composers=J&composers=P')
+>>> f = SongForm(data)
+>>> f.errors
+{}
+>>> from django.utils.datastructures import MultiValueDict
+>>> data = MultiValueDict(dict(name='Yesterday', composers=['J', 'P']))
+>>> f = SongForm(data)
+>>> f.errors
+{}
-
-When using CheckboxSelectMultiple, the framework expects a list of input and