Ticket #10828: 10828.diff

django/forms/formsets.py

@@ -144 +144 @@
                 # if this is an extra form and hasn't changed, don't consider it
                 if i >= self.initial_form_count() and not form.has_changed():
                     continue
-                if form.cleaned_data[DELETION_FIELD_NAME]:
+                field = form.fields[DELETION_FIELD_NAME]
+                raw_value = form._raw_value(DELETION_FIELD_NAME)
+                should_delete = field.clean(raw_value)
+                if should_delete:
                     self._deleted_form_indexes.append(i)
         return [self.forms[i] for i in self._deleted_form_indexes]
     deleted_forms = property(_get_deleted_forms)
@@ -231 +234 @@
                 raw_value = form._raw_value(DELETION_FIELD_NAME)
                 should_delete = field.clean(raw_value)
                 if should_delete:
+                    if not form.is_valid():
+                        form.cleaned_data = {}
                     # This form is going to be deleted so any of its errors
                     # should not cause the entire formset to be invalid.
                     continue

tests/regressiontests/forms/formsets.py

@@ -308 +308 @@
 >>> formset.is_valid()
 True
 
+The formset is valid (due to short circuiting forms marked for deletion), but
+not all forms are valid:
+
+>>> [form.is_valid() for form in formset.forms]
+[True, False, True]
+
+But we can still access the cleaned_data attribute for each form:
+
+>>> [form.cleaned_data for form in formset.forms]
+[{'field': 200, 'DELETE': False}, {}, {}]
+
+And access the deleted form:
+
+>>> len(formset.deleted_forms)
+1
+>>> formset._deleted_form_indexes
+[1]
+
 If we remove the deletion flag now we will have our validation back.
 
 >>> data['check-1-DELETE'] = ''