From 94208399d958e0e9028d61d76f1b877eb3a8f74d Mon Sep 17 00:00:00 2001 From: Kent Hauser Date: Wed, 24 Oct 2012 16:02:30 -0400 Subject: [PATCH] [1.5.x] Add `form` to formwizard context (includes tests) Backport of ba81164fb771391b92575b5aaab6e286f56eb831 from master. --- django/contrib/formtools/tests/wizard/wizardtests/tests.py | 4 ++++ django/contrib/formtools/wizard/views.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/django/contrib/formtools/tests/wizard/wizardtests/tests.py b/django/contrib/formtools/tests/wizard/wizardtests/tests.py index 586bd59341e..6403a5548d8 100644 --- a/django/contrib/formtools/tests/wizard/wizardtests/tests.py +++ b/django/contrib/formtools/tests/wizard/wizardtests/tests.py @@ -72,6 +72,10 @@ class WizardTests(object): self.assertEqual(response.context['wizard']['steps'].current, 'form2') self.assertEqual(response.context.get('another_var', None), True) + # ticket #19025: `form` should be included in context + form = response.context_data['wizard']['form'] + self.assertEqual(response.context_data['form'], form) + def test_form_finish(self): response = self.client.get(self.wizard_url) self.assertEqual(response.status_code, 200) diff --git a/django/contrib/formtools/wizard/views.py b/django/contrib/formtools/wizard/views.py index 5b45267f36a..cba39151e79 100644 --- a/django/contrib/formtools/wizard/views.py +++ b/django/contrib/formtools/wizard/views.py @@ -530,7 +530,7 @@ class WizardView(TemplateView): context.update({'another_var': True}) return context """ - context = super(WizardView, self).get_context_data(**kwargs) + context = super(WizardView, self).get_context_data(form=form, **kwargs) context.update(self.storage.extra_data) context['wizard'] = { 'form': form,