Ticket #5923: required-forms-count.diff

django/newforms/formsets.py

@@ -7 +7 @@
 
 # special field names
 FORM_COUNT_FIELD_NAME = 'COUNT'
+REQUIRED_FORMS_COUNT_FIELD_NAME = 'REQUIRED'
 ORDERING_FIELD_NAME = 'ORDER'
 DELETION_FIELD_NAME = 'DELETE'
 
@@ -17 +18 @@
     increment the count field of this form as well.
     """
     def __init__(self, *args, **kwargs):
+        self.base_fields[REQUIRED_FORMS_COUNT_FIELD_NAME] = IntegerField(widget=HiddenInput)
         self.base_fields[FORM_COUNT_FIELD_NAME] = IntegerField(widget=HiddenInput)
         super(ManagementForm, self).__init__(*args, **kwargs)
 
@@ -37 +39 @@
             self.management_form = ManagementForm(data, files, auto_id=self.auto_id, prefix=self.prefix)
             if self.management_form.is_valid():
                 self.total_forms = self.management_form.cleaned_data[FORM_COUNT_FIELD_NAME]
-                self.required_forms = self.total_forms - self.num_extra
-                self.change_form_count = self.total_forms - self.num_extra
+                self.required_forms = self.management_form.cleaned_data[REQUIRED_FORMS_COUNT_FIELD_NAME]
+                self.change_form_count = self.required_forms
             else:
                 # not sure that ValidationError is the best thing to raise here
                 raise ValidationError('ManagementForm data is missing or has been tampered with')
@@ -46 +48 @@
             self.change_form_count = len(initial)
             self.required_forms = len(initial)
             self.total_forms = self.required_forms + self.num_extra
-            self.management_form = ManagementForm(initial={FORM_COUNT_FIELD_NAME: self.total_forms}, auto_id=self.auto_id, prefix=self.prefix)
+            initial = {
+                    FORM_COUNT_FIELD_NAME: self.total_forms,
+                    REQUIRED_FORMS_COUNT_FIELD_NAME: self.required_forms,
+            }
+            self.management_form = ManagementForm(initial=initial, auto_id=self.auto_id, prefix=self.prefix)
         else:
             self.change_form_count = 0
             self.required_forms = 0
             self.total_forms = self.num_extra
-            self.management_form = ManagementForm(initial={FORM_COUNT_FIELD_NAME: self.total_forms}, auto_id=self.auto_id, prefix=self.prefix)
+            initial = {
+                    FORM_COUNT_FIELD_NAME: self.total_forms,
+                    REQUIRED_FORMS_COUNT_FIELD_NAME: self.required_forms,
+            }
+            self.management_form = ManagementForm(initial=initial, auto_id=self.auto_id, prefix=self.prefix)
 
     def _get_add_forms(self):
         """Return a list of all the add forms in this ``FormSet``."""

tests/modeltests/model_formsets/models.py

@@ -30 +30 @@
 
 >>> data = {
 ...     'form-COUNT': '3',
+...     'form-REQUIRED': '0', # number of forms filled before
 ...     'form-0-name': 'Charles Baudelaire',
 ...     'form-1-name': 'Arthur Rimbaud',
 ...     'form-2-name': '',
@@ -66 +67 @@
 
 >>> data = {
 ...     'form-COUNT': '3',
+...     'form-REQUIRED': '2', # number of forms filled before
 ...     'form-0-id': '2',
 ...     'form-0-name': 'Arthur Rimbaud',
 ...     'form-1-id': '1',
@@ -107 +109 @@
 
 >>> data = {
 ...     'form-COUNT': '4',
+...     'form-REQUIRED': '3', # number of forms filled before
 ...     'form-0-id': '2',
 ...     'form-0-name': 'Arthur Rimbaud',
 ...     'form-1-id': '1',
@@ -148 +151 @@
 
 >>> data = {
 ...     'book_set-COUNT': '3',
+...     'book_set-REQUIRED': '0', # number of forms filled before
 ...     'book_set-0-title': 'Les Fleurs du Mal',
 ...     'book_set-1-title': '',
 ...     'book_set-2-title': '',
@@ -181 +185 @@
 
 >>> data = {
 ...     'book_set-COUNT': '3',
+...     'book_set-REQUIRED': '1', # number of forms filled before
 ...     'book_set-0-id': '1',
 ...     'book_set-0-title': 'Les Fleurs du Mal',
 ...     'book_set-1-title': 'Le Spleen de Paris',

tests/regressiontests/forms/formsets.py

@@ -33 +33 @@
 
 >>> data = {
 ...     'choices-COUNT': '1', # the number of forms rendered
+...     'choices-REQUIRED': '0', # number of forms filled before
 ...     'choices-0-choice': 'Calexico',
 ...     'choices-0-votes': '100',
 ... }
@@ -58 +59 @@
 
 >>> data = {
 ...     'choices-COUNT': '1', # the number of forms rendered
+...     'choices-REQUIRED': '1', # number of forms filled before
+...     'choices-REQUIRED': '0', # number of forms filled before
 ...     'choices-0-choice': 'Calexico',
 ...     'choices-0-votes': '',
 ... }
@@ -94 +97 @@
 
 >>> data = {
 ...     'choices-COUNT': '2', # the number of forms rendered
+...     'choices-REQUIRED': '1', # number of forms filled before
 ...     'choices-0-choice': 'Calexico',
 ...     'choices-0-votes': '100',
 ...     'choices-1-choice': '',
@@ -114 +118 @@
 
 >>> data = {
 ...     'choices-COUNT': '2', # the number of forms rendered
+...     'choices-REQUIRED': '1', # number of forms filled before
 ...     'choices-0-choice': 'Calexico',
 ...     'choices-0-votes': '100',
 ...     'choices-1-choice': 'The Decemberists',
@@ -133 +138 @@
 
 >>> data = {
 ...     'choices-COUNT': '2', # the number of forms rendered
+...     'choices-REQUIRED': '1', # number of forms filled before
 ...     'choices-0-choice': '', # deleted value
 ...     'choices-0-votes': '', # deleted value
 ...     'choices-1-choice': '',
@@ -169 +175 @@
 
 >>> data = {
 ...     'choices-COUNT': '3', # the number of forms rendered
+...     'choices-REQUIRED': '0', # number of forms filled before
 ...     'choices-0-choice': '',
 ...     'choices-0-votes': '',
 ...     'choices-1-choice': '',
@@ -188 +195 @@
 
 >>> data = {
 ...     'choices-COUNT': '3', # the number of forms rendered
+...     'choices-REQUIRED': '0', # number of forms filled before
 ...     'choices-0-choice': 'Calexico',
 ...     'choices-0-votes': '100',
 ...     'choices-1-choice': '',
@@ -207 +215 @@
 
 >>> data = {
 ...     'choices-COUNT': '3', # the number of forms rendered
+...     'choices-REQUIRED': '0', # number of forms filled before
 ...     'choices-0-choice': 'Calexico',
 ...     'choices-0-votes': '100',
 ...     'choices-1-choice': 'The Decemberists',
@@ -244 +253 @@
 
 >>> data = {
 ...     'choices-COUNT': '3', # the number of forms rendered
+...     'choices-REQUIRED': '1', # number of forms filled before
 ...     'choices-0-choice': 'Calexico',
 ...     'choices-0-votes': '100',
 ...     'choices-1-choice': '',
@@ -289 +299 @@
 
 >>> data = {
 ...     'choices-COUNT': '3', # the number of forms rendered
+...     'choices-REQUIRED': '2', # number of forms filled before
 ...     'choices-0-choice': 'Calexico',
 ...     'choices-0-votes': '100',
 ...     'choices-0-DELETE': '',
@@ -336 +347 @@
 
 >>> data = {
 ...     'choices-COUNT': '3', # the number of forms rendered
+...     'choices-REQUIRED': '2', # number of forms filled before
 ...     'choices-0-choice': 'Calexico',
 ...     'choices-0-votes': '100',
 ...     'choices-0-ORDER': '1',
@@ -391 +403 @@
 
 >>> data = {
 ...     'choices-COUNT': '4', # the number of forms rendered
+...     'choices-REQUIRED': '3', # number of forms filled before
 ...     'choices-0-choice': 'Calexico',
 ...     'choices-0-votes': '100',
 ...     'choices-0-ORDER': '1',
@@ -451 +464 @@
 
 >>> data = {
 ...     'drinks-COUNT': '2',
+...     'drinks-REQUIRED': '0', # number of forms filled before
 ...     'drinks-0-name': 'Gin and Tonic',
 ...     'drinks-1-name': 'Gin and Tonic',
 ... }
@@ -471 +485 @@
 
 >>> data = {
 ...     'drinks-COUNT': '2',
+...     'drinks-REQUIRED': '0', # number of forms filled before
 ...     'drinks-0-name': 'Gin and Tonic',
 ...     'drinks-1-name': 'Bloody Mary',
 ... }