Ticket #14574: 14574.diff

django/forms/formsets.py

@@ -119 +119 @@
         if self.is_bound:
             defaults['data'] = self.data
             defaults['files'] = self.files
-        if self.initial:
+        if self.initial and not 'initial' in kwargs:
             try:
                 defaults['initial'] = self.initial[i]
-            except IndexError:
+            except (IndexError, KeyError):
                 pass
         # Allow extra forms to be empty.
         if i >= self.initial_form_count():

django/forms/models.py

@@ -447 +447 @@
             kwargs['instance'] = self._existing_object(pk)
         if i < self.initial_form_count() and not kwargs.get('instance'):
             kwargs['instance'] = self.get_queryset()[i]
+        if i >= self.initial_form_count() and self.initial:
+            # Set initial values for extra forms
+            try:
+                kwargs['initial'] = self.initial[i-self.initial_form_count()]
+            except IndexError:
+                pass
         return super(BaseModelFormSet, self)._construct_form(i, **kwargs)
 
     def get_queryset(self):

docs/topics/forms/modelforms.txt

@@ -613 +613 @@
 
     >>> AuthorFormSet = modelformset_factory(Author, exclude=('birth_date',))
 
+Providing initial values
+------------------------
+
+Like with regular formsets, it is possible to specify initial data for forms
+in the formset. However, with model formsets the initial values only apply to
+extra forms, those which are not bound with an existing object instance.
+
+
 .. _saving-objects-in-the-formset:
 
 Saving objects in the formset