Allow removing Host from selected Host Aggregate

ManageIQ · Oct 3, 2019 · 5641b4c · 5641b4c
1 parent 9a6e1f5
commit 5641b4c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/app/controllers/mixins/ems_common.rb b/app/controllers/mixins/ems_common.rb
@@ -256,7 +256,7 @@ def button
         when 'host_aggregate_edit'              then javascript_redirect(:action => 'edit', :id => checked_or_params, :controller => 'host_aggregate')
         when 'host_aggregate_delete'            then delete_host_aggregates
         when 'host_aggregate_add_host'          then javascript_redirect(:action => 'add_host_select', :id => checked_or_params, :controller => 'host_aggregate')
-        when 'host_aggregate_remove_host'       then javascript_redirect(:action => 'remove_host_select', :id => checked_item_id)
+        when 'host_aggregate_remove_host'       then javascript_redirect(:action => 'remove_host_select', :id => checked_or_params, :controller => 'host_aggregate')
         when 'host_aggregate_tag'               then tag(HostAggregate)
         # Storages
         when "storage_delete"                   then deletestorages
@@ -302,8 +302,8 @@ def button
                      "#{pfx}_evacuate"].include?(params[:pressed]) &&
                     @flash_array.nil?
 
-          unless ["host_edit", 'host_aggregate_edit', 'host_aggregate_add_host', "#{pfx}_edit", "#{pfx}_miq_request_new", "#{pfx}_clone",
-                  "#{pfx}_migrate", "#{pfx}_publish", 'vm_rename', 'flavor_create', 'flavor_delete'].include?(params[:pressed])
+          unless ["host_edit", 'host_aggregate_edit', 'host_aggregate_add_host', 'host_aggregate_remove_host', "#{pfx}_edit", "#{pfx}_miq_request_new",
+                  "#{pfx}_clone", "#{pfx}_migrate", "#{pfx}_publish", 'vm_rename', 'flavor_create', 'flavor_delete'].include?(params[:pressed])
             @refresh_div = "main_div"
             @refresh_partial = "layouts/gtl"
             show                                                        # Handle EMS buttons

diff --git a/spec/controllers/mixins/ems_common_spec.rb b/spec/controllers/mixins/ems_common_spec.rb
@@ -96,6 +96,15 @@
             controller.send(:button)
           end
         end
+
+        context 'removing Host from Host Aggregate' do
+          let(:pressed) { 'host_aggregate_remove_host' }
+
+          it 'calls javascript_redirect to redirect to host_aggregate controller' do
+            expect(controller).to receive(:javascript_redirect).with(:action => 'remove_host_select', :id => [aggregate.id], :controller => 'host_aggregate')
+            controller.send(:button)
+          end
+        end
       end
     end
   end