Containers, Warehouse : multiple del - redirs

1 files changed, 9 insertions, 7 deletions

diff --git a/ishtar_common/wizards.py b/ishtar_common/wizards.py
index f36976684..7802f82cb 100644
--- a/ishtar_common/wizards.py
+++ b/ishtar_common/wizards.py
@@ -959,13 +959,15 @@ class Wizard(IshtarWizard):
             url = reverse(self.redirect_url)
             if self.open_created_in_redirect:
                 url += "?open_item={}".format(obj.pk)
-            return HttpResponseRedirect(url)
-
-        # force evaluation of lazy urls
-        wizard_done_window = str(self.wizard_done_window)
-        if wizard_done_window:
-            dct['wizard_done_window'] = wizard_done_window
-        res = render(self.request, self.wizard_done_template, dct)
+            res = HttpResponseRedirect(url)
+            if not return_object:
+                return res
+        else:
+            # force evaluation of lazy urls
+            wizard_done_window = str(self.wizard_done_window)
+            if wizard_done_window:
+                dct['wizard_done_window'] = wizard_done_window
+            res = render(self.request, self.wizard_done_template, dct)
         return return_object and (obj, res) or res
 
     def get_deleted(self, keys):