Author: julien
Date: 2011-12-19 05:36:32 -0800 (Mon, 19 Dec 2011)
New Revision: 17235
Modified:
django/trunk/django/contrib/formtools/wizard/views.py
django/trunk/docs/ref/contrib/formtools/form-wizard.txt
Log:
Fixed #17163 -- Added the `NamedUrlWizardView.get_step_url()` method. Thanks,
Bradley Ayers.
Modified: django/trunk/django/contrib/formtools/wizard/views.py
===================================================================
--- django/trunk/django/contrib/formtools/wizard/views.py 2011-12-19
13:13:41 UTC (rev 17234)
+++ django/trunk/django/contrib/formtools/wizard/views.py 2011-12-19
13:36:32 UTC (rev 17235)
@@ -591,6 +591,9 @@
'step name "%s" is reserved for "done" view' %
initkwargs['done_step_name']
return initkwargs
+ def get_step_url(self, step):
+ return reverse(self.url_name, kwargs={'step': step})
+
def get(self, *args, **kwargs):
"""
This renders the form or, if needed, does the http redirects.
@@ -604,10 +607,8 @@
query_string = "?%s" % self.request.GET.urlencode()
else:
query_string = ""
- next_step_url = reverse(self.url_name, kwargs={
- 'step': self.steps.current,
- }) + query_string
- return redirect(next_step_url)
+ return redirect(self.get_step_url(self.steps.current)
+ + query_string)
# is the current step the "done" name/view?
elif step_url == self.done_step_name:
@@ -636,7 +637,7 @@
# invalid step name, reset to first and redirect.
else:
self.storage.current_step = self.steps.first
- return redirect(self.url_name, step=self.steps.first)
+ return redirect(self.get_step_url(self.steps.first))
def post(self, *args, **kwargs):
"""
@@ -646,7 +647,7 @@
wizard_goto_step = self.request.POST.get('wizard_goto_step', None)
if wizard_goto_step and wizard_goto_step in self.get_form_list():
self.storage.current_step = wizard_goto_step
- return redirect(self.url_name, step=wizard_goto_step)
+ return redirect(self.get_step_url(wizard_goto_step))
return super(NamedUrlWizardView, self).post(*args, **kwargs)
def get_context_data(self, form, **kwargs):
@@ -665,7 +666,7 @@
"""
next_step = self.get_next_step()
self.storage.current_step = next_step
- return redirect(self.url_name, step=next_step)
+ return redirect(self.get_step_url(next_step))
def render_revalidation_failure(self, failed_step, form, **kwargs):
"""
@@ -673,7 +674,7 @@
step.
"""
self.storage.current_step = failed_step
- return redirect(self.url_name, step=failed_step)
+ return redirect(self.get_step_url(failed_step))
def render_done(self, form, **kwargs):
"""
@@ -681,7 +682,7 @@
name doesn't fit).
"""
if kwargs.get('step', None) != self.done_step_name:
- return redirect(self.url_name, step=self.done_step_name)
+ return redirect(self.get_step_url(self.done_step_name))
return super(NamedUrlWizardView, self).render_done(form, **kwargs)
Modified: django/trunk/docs/ref/contrib/formtools/form-wizard.txt
===================================================================
--- django/trunk/docs/ref/contrib/formtools/form-wizard.txt 2011-12-19
13:13:41 UTC (rev 17234)
+++ django/trunk/docs/ref/contrib/formtools/form-wizard.txt 2011-12-19
13:36:32 UTC (rev 17235)
@@ -557,8 +557,8 @@
``ModelFormSet``. Similarly to :attr:`~WizardView.initial_dict`, these
dictionary key values should be equal to the step number in the form list.
-Usage of NamedUrlWizardView
-===========================
+Usage of ``NamedUrlWizardView``
+===============================
.. class:: NamedUrlWizardView
@@ -595,3 +595,15 @@
url(r'^contact/(?P<step>.+)/$', contact_wizard, name='contact_step'),
url(r'^contact/$', contact_wizard, name='contact'),
)
+
+Advanced ``NamedUrlWizardView`` methods
+=======================================
+
+.. method:: NamedUrlWizardView.get_step_url(step)
+
+ This method returns the URL for a specific step.
+
+ Default implementation::
+
+ def get_step_url(self, step):
+ return reverse(self.url_name, kwargs={'step': step})
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
