Merge branch 'master' into v0.9

1 files changed, 8 insertions, 3 deletions

diff --git a/ishtar_common/wizards.py b/ishtar_common/wizards.py
index 031498ca3..ffbf9b994 100644
--- a/ishtar_common/wizards.py
+++ b/ishtar_common/wizards.py
@@ -188,9 +188,13 @@ class Wizard(NamedUrlWizardView):
         self.request.session['CURRENT_ACTION'] = self.get_wizard_name()
         step = self.steps.first
         current_step = self.steps.current
-        context.update({'current_step': self.form_list[current_step],
-                        'wizard_label': self.label,
-                        'current_object': self.get_current_object()})
+        dct = {'current_step': self.form_list[current_step],
+               'wizard_label': self.label,
+               'current_object': self.get_current_object(),
+               'is_search': current_step.startswith('selec-')
+               if current_step else False
+               }
+        context.update(dct)
         if step == current_step:
             return context
         previous_steps, next_steps, previous_step_counter = [], [], 0
@@ -988,6 +992,7 @@ class SearchWizard(NamedUrlWizardView):
         self.request.session['CURRENT_ACTION'] = self.get_wizard_name()
         current_step = self.steps.current
         context.update({'current_step': self.form_list[current_step],
+                        'is_search': True,
                         'wizard_label': self.label})
         return context