Merge pull request #1331 from gberginc/fix/delete_cloud_volume_from_s…

…torage

Redirect delete action to cloud volume controller
(cherry picked from commit 132c945)

https://bugzilla.redhat.com/show_bug.cgi?id=1459190

app/controllers/ems_common.rb

@@ -470,6 +470,13 @@ def button
       javascript_redirect :controller => "cloud_volume",
                           :action     => "edit",
                           :id         => find_checked_ids_with_rbac(CloudVolume).first
+    elsif params[:pressed] == "cloud_volume_delete"
+      # Clear CloudVolumeController's lastaction, since we are calling the delete_volumes from
+      # an external controller. This will ensure that the final redirect is properly handled.
+      session["#{CloudVolumeController.session_key_prefix}_lastaction".to_sym] = nil
+      javascript_redirect :controller      => "cloud_volume",
+                          :action          => "delete_volumes",
+                          :miq_grid_checks => params[:miq_grid_checks]
     elsif params[:pressed] == "network_router_edit"
       javascript_redirect :controller => "network_router",
                           :action     => "edit",

config/routes.rb

@@ -486,6 +486,7 @@
         backup_select
         snapshot_new
         edit
+        delete_volumes
         cloud_volume_tenants
         index
         new