From fd4ca15897587ecfe7823037729d81ea25069e1d Mon Sep 17 00:00:00 2001 From: Maysa Macedo Date: Mon, 16 Oct 2017 11:22:41 -0300 Subject: [PATCH 1/2] add physical server buttons when displaying through ems_physical_infra --- app/controllers/ems_common.rb | 7 ++++++- app/helpers/application_helper/toolbar_chooser.rb | 2 +- app/views/shared/views/ems_common/_show.html.haml | 4 ++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/app/controllers/ems_common.rb b/app/controllers/ems_common.rb index 534f3ae65d3..4f585b2a2db 100644 --- a/app/controllers/ems_common.rb +++ b/app/controllers/ems_common.rb @@ -192,7 +192,8 @@ def button "orchestration_stack_", "security_group_", "storage_", - "vm_") + "vm_", + "physical_server_") case params[:pressed] # Clusters @@ -232,6 +233,10 @@ def button when "network_router_tag" then tag(NetworkRouter) when "orchestration_stack_tag" then tag(OrchestrationStack) when "security_group_tag" then tag(SecurityGroup) + + when "physical_server_protect" then assign_policies(PhysicalServer) + when "physical_server_tag" then tag(PhysicalServer) + end return if params[:pressed].include?("tag") && !%w(host_tag vm_tag miq_template_tag instance_tag).include?(params[:pressed]) diff --git a/app/helpers/application_helper/toolbar_chooser.rb b/app/helpers/application_helper/toolbar_chooser.rb index ae0f24de4f2..472dfd36f1f 100644 --- a/app/helpers/application_helper/toolbar_chooser.rb +++ b/app/helpers/application_helper/toolbar_chooser.rb @@ -447,7 +447,7 @@ def center_toolbar_filename_classic load_balancers network_ports network_routers orchestration_stacks resource_pools security_groups storages middleware_deployments middleware_datasources middleware_messagings middleware_servers) - to_display_center = %w(stack_orchestration_template topology cloud_object_store_objects generic_objects) + to_display_center = %w(stack_orchestration_template topology cloud_object_store_objects generic_objects physical_servers) if @lastaction == 'show' && (@view || @display != 'main') && !@layout.starts_with?("miq_request") if @display == "vms" || @display == "all_vms" return "vm_infras_center_tb" diff --git a/app/views/shared/views/ems_common/_show.html.haml b/app/views/shared/views/ems_common/_show.html.haml index 3f1b46d1f3f..d168cdf7a4c 100644 --- a/app/views/shared/views/ems_common/_show.html.haml +++ b/app/views/shared/views/ems_common/_show.html.haml @@ -2,6 +2,10 @@ - arr = (controller_name.camelize + "Controller").constantize.display_methods - if arr.include?(@display) && @showtype != "compare" = render :partial => "layouts/gtl", :locals => {:action_url => "show/#{@ems.id}"} + - if %w(physical_servers).include?(@display) + %physical-server-toolbar#ems_physical_infra_show_list_form + :javascript + miq_bootstrap('#ems_physical_infra_show_list_form') - elsif @showtype == "details" = render(:partial => "layouts/gtl", :locals => {:action_url => @lastaction}) - elsif @showtype == "item" From 4833daa43504ba6e1c0ca65c8952ca7d7b91eaa8 Mon Sep 17 00:00:00 2001 From: Maysa Macedo Date: Mon, 16 Oct 2017 17:19:40 -0300 Subject: [PATCH 2/2] Added policy buttons to show physical_server page --- .../toolbar/physical_server_center.rb | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/app/helpers/application_helper/toolbar/physical_server_center.rb b/app/helpers/application_helper/toolbar/physical_server_center.rb index b1cccd89b9b..47c6768ef63 100644 --- a/app/helpers/application_helper/toolbar/physical_server_center.rb +++ b/app/helpers/application_helper/toolbar/physical_server_center.rb @@ -117,4 +117,38 @@ class ApplicationHelper::Toolbar::PhysicalServerCenter < ApplicationHelper::Tool ), ] ) + button_group( + 'physical_server_policy', + [ + select( + :physical_server_policy_choice, + 'fa fa-shield fa-lg', + N_('Policy'), + :enabled => true, + :onwhen => "1+", + :items => [ + button( + :physical_server_protect, + 'pficon pficon-edit fa-lg', + N_('Manage Policies for the selected items'), + N_('Manage Policies'), + :url_parms => "main_div", + :send_checked => true, + :enabled => true, + :onwhen => "1+" + ), + button( + :physical_server_tag, + 'pficon pficon-edit fa-lg', + N_('Edit tags for the selected items'), + N_('Edit Tags'), + :url_parms => "main_div", + :send_checked => true, + :enabled => true, + :onwhen => "1+" + ), + ] + ), + ] + ) end