Merge pull request #1696 from ZitaNemeckova/instance_action_fix

Fix Power actions for Instances in Orchestration Stack page
ManageIQ · Jul 24, 2017 · ea9f54c · ea9f54c
2 parents d9cc9f4 + 7c9cea9
commit ea9f54c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/app/controllers/application_controller/ci_processing.rb b/app/controllers/application_controller/ci_processing.rb
@@ -258,7 +258,7 @@ def vm_button_operation(task, display_name, partial_after_single_selection = nil
 
     # Either a list or coming from a different controller (e.g. from host screen, go to its vms)
     if @lastaction == "show_list" ||
-       !%w(orchestration_stack service vm_cloud vm_infra vm miq_template vm_or_template).include?(controller_name)
+       !%w(service vm_cloud vm_infra vm miq_template vm_or_template).include?(controller_name)
 
       # FIXME: retrieving vms from DB two times
       items = find_checked_ids_with_rbac(klass, task)
@@ -362,7 +362,7 @@ def get_rec_cls
     when "miq_template"
       MiqTemplate
     when "orchestration_stack"
-      OrchestrationStack
+      params[:display] == "instances" ? VmOrTemplate : OrchestrationStack
     when "service"
       Service
     when "cloud_object_store_container"