Ticket #11418: 11418.patch

django/forms/formsets.py

@@ -37 +37 @@
         self.is_bound = data is not None or files is not None
         self.prefix = prefix or self.get_default_prefix()
         self.auto_id = auto_id
-        self.data = data
-        self.files = files
+        self.data = data or {}
+        self.files = files or {}
         self.initial = initial
         self.error_class = error_class
         self._errors = None
@@ -51 +51 @@
 
     def _management_form(self):
         """Returns the ManagementForm instance for this FormSet."""
-        if self.data or self.files:
+        if self.is_bound:
             form = ManagementForm(self.data, auto_id=self.auto_id, prefix=self.prefix)
             if not form.is_valid():
                 raise ValidationError('ManagementForm data is missing or has been tampered with')
@@ -66 +66 @@
 
     def total_form_count(self):
         """Returns the total number of forms in this FormSet."""
-        if self.data or self.files:
+        if self.is_bound:
             return self.management_form.cleaned_data[TOTAL_FORM_COUNT]
         else:
             initial_forms = self.initial_form_count()
@@ -81 +81 @@
 
     def initial_form_count(self):
         """Returns the number of forms that are required in this FormSet."""
-        if self.data or self.files:
+        if self.is_bound:
             return self.management_form.cleaned_data[INITIAL_FORM_COUNT]
         else:
             # Use the length of the inital data if it's there, 0 otherwise.
@@ -101 +101 @@
         Instantiates and returns the i-th form instance in a formset.
         """
         defaults = {'auto_id': self.auto_id, 'prefix': self.add_prefix(i)}
-        if self.data or self.files:
+        if self.is_bound:
             defaults['data'] = self.data
             defaults['files'] = self.files
         if self.initial:
@@ -133 +133 @@
             'prefix': self.add_prefix('__prefix__'),
             'empty_permitted': True,
         }
-        if self.data or self.files:
+        if self.is_bound:
             defaults['data'] = self.data
             defaults['files'] = self.files
         defaults.update(kwargs)

docs/topics/forms/formsets.txt

@@ -100 +100 @@
 all forms in the formset::
 
     >>> ArticleFormSet = formset_factory(ArticleForm)
-    >>> formset = ArticleFormSet({})
+    >>> data = {
+    ...     'form-TOTAL_FORMS': u'1',
+    ...     'form-INITIAL_FORMS': u'0',
+    ...     'form-MAX_NUM_FORMS': u'',
+    ... }
+    >>> formset = ArticleFormSet(data)
     >>> formset.is_valid()
     True
 
@@ -113 +118 @@
     ...     'form-INITIAL_FORMS': u'0',
     ...     'form-MAX_NUM_FORMS': u'',
     ...     'form-0-title': u'Test',
-    ...     'form-0-pub_date': u'16 June 1904',
+    ...     'form-0-pub_date': u'1904-06-16',
     ...     'form-1-title': u'Test',
     ...     'form-1-pub_date': u'', # <-- this date is missing but required
     ... }
@@ -208 +213 @@
     ...     'form-INITIAL_FORMS': u'0',
     ...     'form-MAX_NUM_FORMS': u'',
     ...     'form-0-title': u'Test',
-    ...     'form-0-pub_date': u'16 June 1904',
+    ...     'form-0-pub_date': u'1904-06-16',
     ...     'form-1-title': u'Test',
-    ...     'form-1-pub_date': u'23 June 1912',
+    ...     'form-1-pub_date': u'1912-06-23',
     ... }
     >>> formset = ArticleFormSet(data)
     >>> formset.is_valid()

tests/regressiontests/forms/formsets.py

@@ -5 +5 @@
 FormSet allows us to use multiple instance of the same form on 1 page. For now,
 the best way to create a FormSet is by using the formset_factory function.
 
->>> from django.forms import Form, CharField, IntegerField, ValidationError
+>>> from django.forms import Form, CharField, IntegerField, ValidationError, DateField
 >>> from django.forms.formsets import formset_factory, BaseFormSet
 
 >>> class Choice(Form):
@@ -697 +697 @@
 >>> formset.management_form.prefix
 'form'
 
->>> formset = FavoriteDrinksFormSet(data={})
+>>> data = {
+...     'form-TOTAL_FORMS': '2', # the number of forms rendered
+...     'form-INITIAL_FORMS': '0', # the number of forms with initial data
+...     'form-MAX_NUM_FORMS': '0', # max number of forms
+... }
+>>> formset = FavoriteDrinksFormSet(data=data)
 >>> formset.management_form.prefix
 'form'
 
@@ -721 +726 @@
 >>> print formset.non_form_errors()
 <ul class="errorlist"><li>You may only specify a drink once.</li></ul>
 
+# Regression test for #11418 #################################################
+
+>>> class ArticleForm(Form):
+...     title = CharField()
+...     pub_date = DateField()
+
+>>> ArticleFormSet = formset_factory(ArticleForm)
+>>> formset = ArticleFormSet({})
+Traceback (most recent call last):
+...
+ValidationError: [u'ManagementForm data is missing or has been tampered with']
+>>> data = {
+...     'form-TOTAL_FORMS': u'1',
+...     'form-INITIAL_FORMS': u'0',
+... }
+>>> formset = ArticleFormSet(data)
+>>> formset.initial_form_count()
+0
+>>> formset.total_form_count()
+1
+>>> formset.is_bound
+True
+>>> formset.forms[0].is_bound
+True
+>>> formset.is_valid()
+True
+>>> formset.forms[0].is_valid()
+True
+>>> formset.cleaned_data
+[{}]
+>>> data = {
+...     'form-TOTAL_FORMS': u'2',
+...     'form-INITIAL_FORMS': u'0',
+...     'form-0-title': u'Test',
+...     'form-0-pub_date': u'1904-06-16',
+...     'form-1-title': u'Test',
+...     'form-1-pub_date': u'', # <-- this date is missing but required
+... }
+>>> formset = ArticleFormSet(data)
+>>> formset.is_valid()
+False
+>>> formset.errors
+[{}, {'pub_date': [u'This field is required.']}]
+
 """