Ticket #9587: formset_validation-r9699.diff

django/forms/formsets.py

@@ -218 +218 @@
             return
         for i in range(0, self._total_form_count):
             form = self.forms[i]
+            deletion = "%s-%s" % (self.add_prefix(i), DELETION_FIELD_NAME)
+            if self.can_delete and self.data and deletion in self.data:
+                if self.data[deletion]:
+                    # this form is going to be deleted, populate _errors but
+                    # don't add it to the formset validation
+                    self._errors.append({})
+                    form.full_clean()
+                    continue
+
             self._errors.append(form.errors)
         # Give self.clean() a chance to do cross-form validation.
         try:

tests/regressiontests/forms/formsets.py

@@ -241 +241 @@
 
 # FormSets with deletion ######################################################
 
-We can easily add deletion ability to a FormSet with an agrument to
+We can easily add deletion ability to a FormSet with an argument to
 formset_factory. This will add a boolean field to each form instance. When
 that boolean field is True, the form will be in formset.deleted_forms
 
@@ -286 +286 @@
 >>> [form.cleaned_data for form in formset.deleted_forms]
 [{'votes': 900, 'DELETE': True, 'choice': u'Fergie'}]
 
+If we fill a form with something and then we check the can_delete checkbox for
+that form, we shouldn't validate the form in question since it's going to be
+deleted.
 
+>>> class CheckForm(Form):
+...    field = IntegerField(min_value=100)
+
+>>> data = {
+...     'check-TOTAL_FORMS': '3', # the number of forms rendered
+...     'check-INITIAL_FORMS': '2', # the number of forms with initial data
+...     'check-0-field': '200',
+...     'check-0-DELETE': '',
+...     'check-1-field': '50',
+...     'check-1-DELETE': 'on',
+...     'check-2-field': '',
+...     'check-2-DELETE': '',
+... }
+>>> CheckFormSet = formset_factory(CheckForm, can_delete=True)
+>>> formset = CheckFormSet(data, prefix='check')
+>>> formset.is_valid()
+True
+
+If we remove the deletion flag now we will have our validation back.
+
+>>> data['check-1-DELETE'] = ''
+>>> formset = CheckFormSet(data, prefix='check')
+>>> formset.is_valid()
+False
+
 # FormSets with ordering ######################################################
 
 We can also add ordering ability to a FormSet with an agrument to