Ticket #5175: required_forms-formsets.diff

django/newforms/formsets.py

@@ -1 +1 @@
 from forms import Form, ValidationError
 from fields import IntegerField, BooleanField
 from widgets import HiddenInput
+from util import ErrorList, ErrorDict
 
 # special field names
 FORM_COUNT_FIELD_NAME = 'COUNT'
@@ -21 +22 @@
     """A collection of instances of the same Form class."""
 
     def __init__(self, data=None, files=None, auto_id='id_%s', prefix=None, initial=None):
-        self.is_bound = data is not None and files is not None
+        self.is_bound = data is not None or files is not None
         self.prefix = prefix or 'form'
         self.auto_id = auto_id
         self.data = data
@@ -61 +62 @@
                     kwargs['files'] = self.files
                 add_form = FormClass(**kwargs)
                 self.add_fields(add_form, i)
+                # HACK: Form is empty, lets re-create without data so it doesn't trip validation
+                if self.data and add_form.is_empty():
+                    del(kwargs['data'])
+                    add_form = FormClass(**kwargs)
+                    self.add_fields(add_form, i)
                 add_forms.append(add_form)
             self._add_forms = add_forms
         return self._add_forms
@@ -69 +75 @@
     def _get_change_forms(self):
         """Return a list of all the change forms in this ``FormSet``."""
         FormClass = self.form_class
-        if not hasattr(self, '_add_forms'):
+        if not hasattr(self, '_change_forms'):
             change_forms = []
             for i in range(0, self.change_form_count):
                 kwargs = {'auto_id': self.auto_id, 'prefix': self.add_prefix(i)}
@@ -134 +140 @@
         if self.orderable:
             cleaned_data.sort(lambda x,y: x[ORDERING_FIELD_NAME] - y[ORDERING_FIELD_NAME])
 
+        if is_valid and self.required_forms > len(cleaned_data):
+            self.formset_errors = ErrorList(['At least %s data set(s) are required.' % self.required_forms])
+            is_valid = False
+            
         if is_valid:
             self.cleaned_data = cleaned_data
             self.deleted_data = deleted_data
@@ -151 +161 @@
         return '%s-%s' % (self.prefix, index)
 
     def is_valid(self):
+        if not self.is_bound:
+            return False
         self.full_clean()
         return self._is_valid
 
@@ -161 +173 @@
 
 def all_valid(formsets):
     """Returns true if every formset in formsets is valid."""
+    if_valid = True
     for formset in formsets:
         if not formset.is_valid():
-            return False
-    return True
- No newline at end of file
+            is_valid = False
+    return is_valid
+ No newline at end of file