Ticket #10882: form_wizard_10882.1.diff

django/contrib/formtools/wizard.py

@@ -58 +58 @@
         if current_step >= self.num_steps():
             raise Http404('Step %s does not exist' % current_step)
 
+        # Use valid_forms if the done() is called.
+        valid_forms = []
         # For each previous step, verify the hash and process.
         # TODO: Move "hash_%d" to a method to make it configurable.
         for i in range(current_step):
             form = self.get_form(i, request.POST)
             if request.POST.get("hash_%d" % i, '') != self.security_hash(request, form):
                 return self.render_hash_failure(request, i)
+            # process_step needs a clean, valid form. So, validate all the forms.
+            # Also serves as a sanity check.
+            if not form.is_valid():
+                return self.render_revalidation_failure(request, i, form)
+            valid_forms.append(form)
             self.process_step(request, form, i)
 
         # Process the current step. If it's valid, go to the next step or call
@@ -73 +80 @@
         else:
             form = self.get_form(current_step)
         if form.is_valid():
+            valid_forms.append(form)
             self.process_step(request, form, current_step)
             next_step = current_step + 1
 
-            # If this was the last step, validate all of the forms one more
-            # time, as a sanity check, and call done().
-            num = self.num_steps()
-            if next_step == num:
-                final_form_list = [self.get_form(i, request.POST) for i in range(num)]
+            # If this was the last step, call done() with final list of validated forms.
+            if next_step == self.num_steps():
+                return self.done(request, valid_forms)
 
-                # Validate all the forms. If any of them fail validation, that
-                # must mean the validator relied on some other input, such as
-                # an external Web site.
-                for i, f in enumerate(final_form_list):
-                    if not f.is_valid():
-                        return self.render_revalidation_failure(request, i, f)
-                return self.done(request, final_form_list)
-
             # Otherwise, move along to the next step.
             else:
                 form = self.get_form(next_step)