Check that delete of OrchestrationStack didn't return an exception

ManageIQ · Nov 27, 2017 · cead77d · cead77d
1 parent 00c69cc
commit cead77d
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/app/controllers/application_controller/ci_processing.rb b/app/controllers/application_controller/ci_processing.rb
@@ -891,7 +891,15 @@ def deletehosts
   # Delete all selected or single displayed stack(s)
   def orchestration_stack_delete
     assert_privileges("orchestration_stack_delete")
-    delete_elements(OrchestrationStack, :process_orchestration_stacks)
+    begin
+      delete_elements(OrchestrationStack, :process_orchestration_stacks)
+    rescue StandardError => err
+      add_flash(_("Error during deletion: %{error_message}") % {:error_message => err.message}, :error)
+      if @lastaction == "show_list"
+        show_list
+        @refresh_partial = "layouts/gtl"
+      end
+    end
   end
 
   def configuration_job_delete