Ticket #6314: 6314-2.diff

tests/modeltests/model_forms/models.py

@@ -325 +325 @@
 >>> print f
 <tr><th>Name:</th><td><input type="text" name="name" value="Mike Royko" maxlength="50" /><br />Use both first and last names.</td></tr>
 
+The 'initial' argument to a ModelForm can be a MultiValueDict.
+>>> from django.utils.datastructures import MultiValueDict
+>>> f = CategoryForm(initial=MultiValueDict({'name': ['V1', 'V2']}))
+>>> print f['name']
+<input id="id_name" type="text" name="name" value="V2" maxlength="20" />
+
 >>> art = Article(headline='Test article', slug='test-article', pub_date=datetime.date(1988, 1, 4), writer=w, article='Hello.')
 >>> art.save()
 >>> art.id

django/newforms/models.py

@@ -7 +7 @@
 
 from django.utils.translation import ugettext_lazy as _
 from django.utils.encoding import smart_unicode
-from django.utils.datastructures import SortedDict
+from django.utils.datastructures import SortedDict, MultiValueDict
 from django.core.exceptions import ImproperlyConfigured
 
 from util import ValidationError, ErrorList
@@ -272 +272 @@
             object_data = model_to_dict(instance, opts.fields, opts.exclude)
         # if initial was provided, it should override the values from instance
         if initial is not None:
-            object_data.update(initial)
+            if isinstance(initial, MultiValueDict):
+                for k, v in initial.items():
+                    object_data[k] = v
+            else:
+                object_data.update(initial)
         BaseForm.__init__(self, data, files, auto_id, prefix, object_data, error_class, label_suffix)
 
     def save(self, commit=True):