Permalink
Browse files

Fixed #3114 -- newforms MultipleChoiceField now handles MultiValueDi…

…cts properly. Thanks for the patch, Honza Král

git-svn-id: http://code.djangoproject.com/svn/django/trunk@4196 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
adrianholovaty committed Dec 13, 2006
1 parent 49f6d06 commit 4add4e4272a05a8c9773f8a450d1f15b4fdf4b63
Showing with 27 additions and 1 deletion.
  1. +3 −1 django/newforms/forms.py
  2. +7 −0 django/newforms/widgets.py
  3. +17 −0 tests/regressiontests/forms/tests.py
View
@@ -2,7 +2,7 @@
Form classes
"""
-from django.utils.datastructures import SortedDict
+from django.utils.datastructures import SortedDict, MultiValueDict
from django.utils.html import escape
from fields import Field
from widgets import TextInput, Textarea, HiddenInput
@@ -221,6 +221,8 @@ def as_hidden(self, attrs=None):
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)
@@ -9,6 +9,7 @@
)
from util import StrAndUnicode, smart_unicode
+from django.utils.datastructures import MultiValueDict
from django.utils.html import escape
from itertools import chain
@@ -64,6 +65,7 @@ class Input(Widget):
type='radio', which are special).
"""
input_type = None # Subclasses must define this.
+
def render(self, name, value, attrs=None):
if value is None: value = ''
final_attrs = self.build_attrs(attrs, type=self.input_type, name=name)
@@ -146,6 +148,11 @@ def render(self, name, value, attrs=None, choices=()):
output.append(u'</select>')
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'>."
def __init__(self, name, value, attrs, choice, index):
@@ -1672,6 +1672,23 @@
<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
returns a list of input.
>>> f = SongForm({'name': 'Yesterday'}, auto_id=False)

0 comments on commit 4add4e4

Please sign in to comment.