Don't validate the form when clicking on previous step (refs #1462, refs #1463)

If a field has been changed a confirmation dialog appear.

1 files changed, 15 insertions, 12 deletions

diff --git a/ishtar_common/wizards.py b/ishtar_common/wizards.py
index f0302d70f..89f005a0a 100644
--- a/ishtar_common/wizards.py
+++ b/ishtar_common/wizards.py
@@ -534,18 +534,21 @@ class Wizard(NamedUrlWizardView):
         return super(Wizard, self).render_next_step(form, **kwargs)
 
     def post(self, *args, **kwargs):
-        """Convert numerical step number to step name"""
-        request = self.request
-        post_data = request.POST.copy()
-        if request.POST.has_key('form_prev_step'):
-            try:
-                step_number = int(request.POST['form_prev_step'])
-                post_data['wizard_goto_step'] = self.get_form_list().keys(
-                                                                 )[step_number]
-            except ValueError:
-                pass
-        request.POST = post_data
-        return super(Wizard, self).post(*args, **kwargs)
+        # manage previous (or next) step
+        form_prev_step = self.request.POST.get('form_prev_step', None)
+        if not form_prev_step:
+            return super(Wizard, self).post(*args, **kwargs)
+        try:
+            # convert numerical step number to step name
+            step_number = int(self.request.POST['form_prev_step'])
+            wizard_goto_step = self.get_form_list().keys()[step_number]
+        except (ValueError, IndexError):
+            return super(Wizard, self).post(*args, **kwargs)
+        self.storage.current_step = wizard_goto_step
+        form = self.get_form(
+            data=self.storage.get_step_data(self.steps.current),
+            files=self.storage.get_step_files(self.steps.current))
+        return self.render(form)
 
     def session_has_key(self, form_key, key=None, multi=None):
         """Check if the session has value of a specific form and (if provided)