Wizard: allow fields initialization with GET

1 files changed, 7 insertions, 3 deletions

diff --git a/ishtar_common/wizards.py b/ishtar_common/wizards.py
index ab17ff422..9d69577c3 100644
--- a/ishtar_common/wizards.py
+++ b/ishtar_common/wizards.py
@@ -1227,16 +1227,20 @@ class Wizard(IshtarWizard):
             return self.get_instanced_init(current_obj, step)
 
         current_form = self.form_list[current_step]
+        initial = MultiValueDict()
         if hasattr(current_form, 'currents'):
-            initial = MultiValueDict()
             for key in current_form.currents:
                 model_name = current_form.currents[key].__name__.lower()
                 val = model_name in request.session and \
                     request.session[model_name]
                 if val:
                     initial[key] = val
-            if initial:
-                return initial
+        if not initial and hasattr(current_form, "base_fields"):
+            for k in current_form.base_fields:
+                if self.request.GET.get(k, None):
+                    initial[k] = self.request.GET[k]
+        if initial:
+            return initial
         return super(Wizard, self).get_form_initial(step)
 
     def get_object_name(self, obj):