Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #14576 - FormWizard.done() method doesn't get passed the last f…

…orm in the list

Thanks to cyberdelia for report and test, and steph for the initial patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14574 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit b84838aef4de49c9567c98bd8a8d492e177e5e4f 1 parent b9e6db4
@spookylukey spookylukey authored
View
24 django/contrib/formtools/tests/__init__.py
@@ -360,3 +360,27 @@ def process_step(self, request, form, step):
"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])
+
View
6 django/contrib/formtools/wizard.py
@@ -116,9 +116,9 @@ def __call__(self, request, *args, **kwargs):
# 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 @@ def __call__(self, request, *args, **kwargs):
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
Please sign in to comment.
Something went wrong with that request. Please try again.