Ticket #16179: 16179.diff

django/contrib/formtools/wizard/tests/wizardtests/tests.py

@@ -244 +244 @@
             'cookie_contact_wizard-current_step': 'form4',
         }
     )
+    
+class WizardTestKwargs(TestCase):
+    wizard_url = '/wiz_extra_context/'
+    wizard_step_1_data = {
+        'cookie_contact_wizard-current_step': 'form1',
+    }
+    wizard_step_data = (
+        {
+            'form1-name': 'Pony',
+            'form1-thirsty': '2',
+            'cookie_contact_wizard-current_step': 'form1',
+        },
+        {
+            'form2-address1': '123 Main St',
+            'form2-address2': 'Djangoland',
+            'cookie_contact_wizard-current_step': 'form2',
+        },
+        {
+            'form3-random_crap': 'blah blah',
+            'cookie_contact_wizard-current_step': 'form3',
+        },
+        {
+            'form4-INITIAL_FORMS': '0',
+            'form4-TOTAL_FORMS': '2',
+            'form4-MAX_NUM_FORMS': '0',
+            'form4-0-random_crap': 'blah blah',
+            'form4-1-random_crap': 'blah blah',
+            'cookie_contact_wizard-current_step': 'form4',
+        }
+    )
+    urls = 'django.contrib.formtools.wizard.tests.wizardtests.urls'
+
+    def setUp(self):
+        self.testuser, created = User.objects.get_or_create(username='testuser1')
+        self.wizard_step_data[0]['form1-user'] = self.testuser.pk
+
+        wizard_template_dirs = [os.path.join(os.path.dirname(__file__), 'templates')]
+        settings.TEMPLATE_DIRS = list(settings.TEMPLATE_DIRS) + wizard_template_dirs
+        
+    def tearDown(self):
+        del settings.TEMPLATE_DIRS[-1]
+        
+    def test_context(self):
+        response = self.client.get(self.wizard_url)
+        self.assertEqual(response.context['extra_title'], 'Hello World!')
+    
+    def test_template(self):
+        response = self.client.get(self.wizard_url)
+        self.assertNotEqual(response.content.find('<h1>Hello World!</h1>'), -1)
+
+    
+    
+    
 
 

django/contrib/formtools/wizard/tests/wizardtests/urls.py

@@ -13 +13 @@
          ('form2', Page2),
          ('form3', Page3),
          ('form4', Page4)])),
+         
+     url(r'^wiz_extra_context/$', CookieContactWizard.as_view(
+         [('form1', Page1),
+          ('form2', Page2),
+          ('form3', Page3),
+          ('form4', Page4)], 
+          extra_context={'extra_title': 'Hello World!'},
+          template_name='some_other_template.html')),
 )

django/contrib/formtools/wizard/tests/wizardtests/templates/some_other_template.html

@@ +1 @@
+{% load i18n %}
+{% csrf_token %}
+{% if extra_title %}<h1>{{ extra_title }}</h1>{% endif %}
+{{ wizard.management_form }}
+{% if wizard.form.forms %}
+    {{ wizard.form.management_form }}
+    {% for form in wizard.form.forms %}
+        {{ form.as_p }}
+    {% endfor %}
+{% else %}
+    {{ wizard.form.as_p }}
+{% endif %}
+
+{% if wizard.steps.prev %}
+<button name="wizard_prev_step" value="{{ wizard.steps.first }}">{% trans "first step" %}</button>
+<button name="wizard_prev_step" value="{{ wizard.steps.prev }}">{% trans "prev step" %}</button>
+{% endif %}
+<input type="submit" name="submit" value="{% trans "submit" %}" />

django/contrib/formtools/wizard/views.py

@@ -96 +96 @@
     instance_dict = None
     condition_dict = None
     template_name = 'formtools/wizard/wizard_form.html'
+    extra_context = None
 
     def __repr__(self):
         return '<%s: forms: %s>' % (self.__class__.__name__, self.form_list)
@@ -112 +113 @@
 
     @classmethod
     def get_initkwargs(cls, form_list,
-            initial_dict=None, instance_dict=None, condition_dict=None):
+            initial_dict=None, instance_dict=None, condition_dict=None, **kwargs):
         """
         Creates a dict with all needed parameters for the form wizard instances.
 
@@ -134 +135 @@
           will be called with the formwizard instance as the only argument.
           If the return value is true, the step's form will be used.
         """
-        kwargs = {
+        kwargs.update({
             'initial_dict': initial_dict or {},
             'instance_dict': instance_dict or {},
             'condition_dict': condition_dict or {},
-        }
+        })
         init_form_list = SortedDict()
 
         assert len(form_list) > 0, 'at least one form is needed'
@@ -512 +513 @@
                         context.update({'another_var': True})
                     return context
         """
-        context = super(WizardView, self).get_context_data(*args, **kwargs)
+        context = super(WizardView, self).get_context_data(*args, **kwargs) 
+        context.update(self.extra_context or {})
         context.update(self.storage.extra_data)
         context['wizard'] = {
             'form': form,