From cec109c5af2a956a5910fbf643505c9b777948df Mon Sep 17 00:00:00 2001 From: David Resende Date: Mon, 24 Apr 2023 15:27:48 -0400 Subject: [PATCH] Changed Feature Name from native to management_console --- app/controllers/ems_cloud_controller.rb | 2 +- app/controllers/ems_infra_controller.rb | 2 +- .../button/management_console.rb | 7 +++++++ .../application_helper/button/native_console.rb | 7 ------- .../button/vm_management_console.rb | 2 +- .../instance_operations_button_group_mixin.rb | 4 ++-- .../application_helper/toolbar/ems_cloud_center.rb | 14 +++++++------- .../application_helper/toolbar/ems_infra_center.rb | 14 +++++++------- .../toolbar/ems_physical_infra_center.rb | 2 +- .../application_helper/toolbar/x_vm_center.rb | 4 ++-- 10 files changed, 29 insertions(+), 29 deletions(-) create mode 100644 app/helpers/application_helper/button/management_console.rb delete mode 100644 app/helpers/application_helper/button/native_console.rb diff --git a/app/controllers/ems_cloud_controller.rb b/app/controllers/ems_cloud_controller.rb index c0dbd9371fe..ea89be179ed 100644 --- a/app/controllers/ems_cloud_controller.rb +++ b/app/controllers/ems_cloud_controller.rb @@ -43,7 +43,7 @@ def restful? end def launch_console - open_console('ems_native_console') + open_console('ems_management_console') end menu_section :clo diff --git a/app/controllers/ems_infra_controller.rb b/app/controllers/ems_infra_controller.rb index fc83cec2f42..b3553f0cfc3 100644 --- a/app/controllers/ems_infra_controller.rb +++ b/app/controllers/ems_infra_controller.rb @@ -211,7 +211,7 @@ def restful? end def launch_console - open_console('ems_native_console') + open_console('ems_management_console') end def download_data diff --git a/app/helpers/application_helper/button/management_console.rb b/app/helpers/application_helper/button/management_console.rb new file mode 100644 index 00000000000..69f078dfea1 --- /dev/null +++ b/app/helpers/application_helper/button/management_console.rb @@ -0,0 +1,7 @@ +class ApplicationHelper::Button::ManagementConsole < ApplicationHelper::Button::Basic + needs(:@record) + + def visible? + @record.supports?(:management_console) + end +end diff --git a/app/helpers/application_helper/button/native_console.rb b/app/helpers/application_helper/button/native_console.rb deleted file mode 100644 index a0d3656e87e..00000000000 --- a/app/helpers/application_helper/button/native_console.rb +++ /dev/null @@ -1,7 +0,0 @@ -class ApplicationHelper::Button::NativeConsole < ApplicationHelper::Button::Basic - needs(:@record) - - def visible? - @record.supports?(:native_console) - end -end diff --git a/app/helpers/application_helper/button/vm_management_console.rb b/app/helpers/application_helper/button/vm_management_console.rb index 03d6739d351..8619309dcc3 100644 --- a/app/helpers/application_helper/button/vm_management_console.rb +++ b/app/helpers/application_helper/button/vm_management_console.rb @@ -2,6 +2,6 @@ class ApplicationHelper::Button::VmManagementConsole < ApplicationHelper::Button needs :@record def visible? - @record.vendor == 'ibm_power_hmc' + @record.supports?(:management_console) end end diff --git a/app/helpers/application_helper/toolbar/cloud/instance_operations_button_group_mixin.rb b/app/helpers/application_helper/toolbar/cloud/instance_operations_button_group_mixin.rb index 93c735898b8..6dc131e64e8 100644 --- a/app/helpers/application_helper/toolbar/cloud/instance_operations_button_group_mixin.rb +++ b/app/helpers/application_helper/toolbar/cloud/instance_operations_button_group_mixin.rb @@ -108,14 +108,14 @@ def self.included(included_class) :klass => ApplicationHelper::Button::VmHtml5Console ), included_class.button( - :vm_native_console, + :vm_management_console, 'pficon pficon-screen fa-lg', N_('Open a management console for this VM'), N_('Management Console'), :keepSpinner => true, :url => "management_console", :klass => ApplicationHelper::Button::GenericFeatureButton, - :options => {:feature => :native_console} + :options => {:feature => :management_console} ), ] ), diff --git a/app/helpers/application_helper/toolbar/ems_cloud_center.rb b/app/helpers/application_helper/toolbar/ems_cloud_center.rb index 946f635b31b..ed0a1a5621e 100644 --- a/app/helpers/application_helper/toolbar/ems_cloud_center.rb +++ b/app/helpers/application_helper/toolbar/ems_cloud_center.rb @@ -121,22 +121,22 @@ class ApplicationHelper::Toolbar::EmsCloudCenter < ApplicationHelper::Toolbar::B :url_parms => "?display=main" ), ]) - button_group('ems_native_console', [ + button_group('ems_management_console', [ select( - :ems_native_console, + :ems_management_console, nil, N_('Remote Access'), N_('Access'), :items => [ button( - :ems_native_console, + :ems_management_console, 'pficon pficon-screen fa-lg', - N_('Open a native console for this cloud provider'), - N_('Native Console'), + N_('Open a management console for this cloud provider'), + N_('Management Console'), :keepSpinner => true, :url => "launch_console", - :confirm => N_("Open native console for this provider"), - :klass => ApplicationHelper::Button::NativeConsole, + :confirm => N_("Open management console for this provider"), + :klass => ApplicationHelper::Button::ManagementConsole, :popup => true ) ] diff --git a/app/helpers/application_helper/toolbar/ems_infra_center.rb b/app/helpers/application_helper/toolbar/ems_infra_center.rb index 837c3926c97..1ad873282fb 100644 --- a/app/helpers/application_helper/toolbar/ems_infra_center.rb +++ b/app/helpers/application_helper/toolbar/ems_infra_center.rb @@ -133,22 +133,22 @@ class ApplicationHelper::Toolbar::EmsInfraCenter < ApplicationHelper::Toolbar::B ] ), ]) - button_group('ems_native_console', [ + button_group('ems_management_console', [ select( - :ems_native_console, + :ems_management_console, nil, N_('Remote Access'), N_('Access'), :items => [ button( - :ems_native_console, + :ems_management_console, 'pficon pficon-screen fa-lg', - N_('Open a native console for this infrastructure provider'), - N_('Native Console'), + N_('Open a management console for this infrastructure provider'), + N_('Management Console'), :keepSpinner => true, :url => "launch_console", - :confirm => N_("Open native console for this provider"), - :klass => ApplicationHelper::Button::NativeConsole, + :confirm => N_("Open management console for this provider"), + :klass => ApplicationHelper::Button::ManagementConsole, :popup => true ) ] diff --git a/app/helpers/application_helper/toolbar/ems_physical_infra_center.rb b/app/helpers/application_helper/toolbar/ems_physical_infra_center.rb index 603cd6455f7..321dfaaffd1 100644 --- a/app/helpers/application_helper/toolbar/ems_physical_infra_center.rb +++ b/app/helpers/application_helper/toolbar/ems_physical_infra_center.rb @@ -92,7 +92,7 @@ class ApplicationHelper::Toolbar::EmsPhysicalInfraCenter < ApplicationHelper::To :keepSpinner => true, :url => "launch_console", :confirm => N_("Open management console for this provider"), - :klass => ApplicationHelper::Button::NativeConsole, + :klass => ApplicationHelper::Button::ManagementConsole, :options => {:feature => :console}) ] ), diff --git a/app/helpers/application_helper/toolbar/x_vm_center.rb b/app/helpers/application_helper/toolbar/x_vm_center.rb index b5524bd3006..7113d91b4b5 100644 --- a/app/helpers/application_helper/toolbar/x_vm_center.rb +++ b/app/helpers/application_helper/toolbar/x_vm_center.rb @@ -309,14 +309,14 @@ class ApplicationHelper::Toolbar::XVmCenter < ApplicationHelper::Toolbar::Basic :klass => ApplicationHelper::Button::VmNativeConsole ), button( - :vm_native_console, + :vm_management_console, 'pficon pficon-screen fa-lg', N_('Open a management console for this VM'), N_('Management Console'), :keepSpinner => true, :url => "management_console", :klass => ApplicationHelper::Button::VmManagementConsole, - :options => {:feature => :native_console} + :options => {:feature => :management_console} ), ] ),