diff --git a/django/contrib/formtools/tests/__init__.py b/django/contrib/formtools/tests/__init__.py index 9c7d46f98a..4c71c50321 100644 --- a/django/contrib/formtools/tests/__init__.py +++ b/django/contrib/formtools/tests/__init__.py @@ -360,3 +360,27 @@ class WizardTests(TestCase): "wizard_step": "1"} wizard(DummyRequest(POST=data)) + def test_14576(self): + """ + Regression test for ticket #14576. + + The form of the last step is not passed to the done method. + """ + reached = [False] + that = self + + class Wizard(WizardClass): + def done(self, request, form_list): + reached[0] = True + that.assertTrue(len(form_list) == 2) + + wizard = Wizard([WizardPageOneForm, + WizardPageTwoForm]) + + data = {"0-field": "test", + "1-field": "test2", + "hash_0": "2fdbefd4c0cad51509478fbacddf8b13", + "wizard_step": "1"} + wizard(DummyRequest(POST=data)) + self.assertTrue(reached[0]) + diff --git a/django/contrib/formtools/wizard.py b/django/contrib/formtools/wizard.py index d382e297c5..e0f5e2c64a 100644 --- a/django/contrib/formtools/wizard.py +++ b/django/contrib/formtools/wizard.py @@ -116,9 +116,9 @@ class FormWizard(object): # Since the hashes only take into account values, and not other # other validation the form might do, we must re-do validation # now for security reasons. - current_form_list = [self.get_form(i, request.POST) for i in range(current_step)] + previous_form_list = [self.get_form(i, request.POST) for i in range(current_step)] - for i, f in enumerate(current_form_list): + for i, f in enumerate(previous_form_list): if not self._check_security_hash(request.POST.get("hash_%d" % i, ''), request, f): return self.render_hash_failure(request, i) @@ -132,7 +132,7 @@ class FormWizard(object): next_step = current_step + 1 if next_step == self.num_steps(): - return self.done(request, current_form_list) + return self.done(request, previous_form_list + [form]) else: form = self.get_form(next_step) self.step = current_step = next_step