Ticket #9061: t9061-a.diff

django/forms/formsets.py

@@ -242 +242 @@
                 form.fields[ORDERING_FIELD_NAME] = IntegerField(label=_(u'Order'), initial=index+1, required=False)
             else:
                 form.fields[ORDERING_FIELD_NAME] = IntegerField(label=_(u'Order'), required=False)
-        if self.can_delete:
+        if self.can_delete and index < self._initial_form_count:
             form.fields[DELETION_FIELD_NAME] = BooleanField(label=_(u'Delete'), required=False)
 
     def add_prefix(self, index):

django/forms/models.py

@@ -400 +400 @@
         for form in self.extra_forms:
             if not form.has_changed():
                 continue
-            # If someone has marked an add form for deletion, don't save the
-            # object.
-            if self.can_delete and form.cleaned_data[DELETION_FIELD_NAME]:
-                continue
             self.new_objects.append(self.save_new(form, commit=commit))
             if not commit:
                 self.saved_forms.append(form)