Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changed Feature Name from native to management_console #8762

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/controllers/ems_cloud_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def restful?
end

def launch_console
open_console('ems_native_console')
open_console('ems_management_console')
end

menu_section :clo
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/ems_infra_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ def restful?
end

def launch_console
open_console('ems_native_console')
open_console('ems_management_console')
end

def download_data
Expand Down
7 changes: 7 additions & 0 deletions app/helpers/application_helper/button/management_console.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
class ApplicationHelper::Button::ManagementConsole < ApplicationHelper::Button::Basic
needs(:@record)

def visible?
@record.supports?(:management_console)
end
end
7 changes: 0 additions & 7 deletions app/helpers/application_helper/button/native_console.rb

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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}
),
]
),
Expand Down
14 changes: 7 additions & 7 deletions app/helpers/application_helper/toolbar/ems_cloud_center.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
]
Expand Down
14 changes: 7 additions & 7 deletions app/helpers/application_helper/toolbar/ems_infra_center.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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})
]
),
Expand Down
4 changes: 2 additions & 2 deletions app/helpers/application_helper/toolbar/x_vm_center.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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}
),
]
),
Expand Down
Loading