Skip to content

Commit cec109c

Browse files
committed
Changed Feature Name from native to management_console
1 parent 664bf92 commit cec109c

10 files changed

+29
-29
lines changed

app/controllers/ems_cloud_controller.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def restful?
4343
end
4444

4545
def launch_console
46-
open_console('ems_native_console')
46+
open_console('ems_management_console')
4747
end
4848

4949
menu_section :clo

app/controllers/ems_infra_controller.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ def restful?
211211
end
212212

213213
def launch_console
214-
open_console('ems_native_console')
214+
open_console('ems_management_console')
215215
end
216216

217217
def download_data
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
class ApplicationHelper::Button::ManagementConsole < ApplicationHelper::Button::Basic
2+
needs(:@record)
3+
4+
def visible?
5+
@record.supports?(:management_console)
6+
end
7+
end

app/helpers/application_helper/button/native_console.rb

-7
This file was deleted.

app/helpers/application_helper/button/vm_management_console.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ class ApplicationHelper::Button::VmManagementConsole < ApplicationHelper::Button
22
needs :@record
33

44
def visible?
5-
@record.vendor == 'ibm_power_hmc'
5+
@record.supports?(:management_console)
66
end
77
end

app/helpers/application_helper/toolbar/cloud/instance_operations_button_group_mixin.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -108,14 +108,14 @@ def self.included(included_class)
108108
:klass => ApplicationHelper::Button::VmHtml5Console
109109
),
110110
included_class.button(
111-
:vm_native_console,
111+
:vm_management_console,
112112
'pficon pficon-screen fa-lg',
113113
N_('Open a management console for this VM'),
114114
N_('Management Console'),
115115
:keepSpinner => true,
116116
:url => "management_console",
117117
:klass => ApplicationHelper::Button::GenericFeatureButton,
118-
:options => {:feature => :native_console}
118+
:options => {:feature => :management_console}
119119
),
120120
]
121121
),

app/helpers/application_helper/toolbar/ems_cloud_center.rb

+7-7
Original file line numberDiff line numberDiff line change
@@ -121,22 +121,22 @@ class ApplicationHelper::Toolbar::EmsCloudCenter < ApplicationHelper::Toolbar::B
121121
:url_parms => "?display=main"
122122
),
123123
])
124-
button_group('ems_native_console', [
124+
button_group('ems_management_console', [
125125
select(
126-
:ems_native_console,
126+
:ems_management_console,
127127
nil,
128128
N_('Remote Access'),
129129
N_('Access'),
130130
:items => [
131131
button(
132-
:ems_native_console,
132+
:ems_management_console,
133133
'pficon pficon-screen fa-lg',
134-
N_('Open a native console for this cloud provider'),
135-
N_('Native Console'),
134+
N_('Open a management console for this cloud provider'),
135+
N_('Management Console'),
136136
:keepSpinner => true,
137137
:url => "launch_console",
138-
:confirm => N_("Open native console for this provider"),
139-
:klass => ApplicationHelper::Button::NativeConsole,
138+
:confirm => N_("Open management console for this provider"),
139+
:klass => ApplicationHelper::Button::ManagementConsole,
140140
:popup => true
141141
)
142142
]

app/helpers/application_helper/toolbar/ems_infra_center.rb

+7-7
Original file line numberDiff line numberDiff line change
@@ -133,22 +133,22 @@ class ApplicationHelper::Toolbar::EmsInfraCenter < ApplicationHelper::Toolbar::B
133133
]
134134
),
135135
])
136-
button_group('ems_native_console', [
136+
button_group('ems_management_console', [
137137
select(
138-
:ems_native_console,
138+
:ems_management_console,
139139
nil,
140140
N_('Remote Access'),
141141
N_('Access'),
142142
:items => [
143143
button(
144-
:ems_native_console,
144+
:ems_management_console,
145145
'pficon pficon-screen fa-lg',
146-
N_('Open a native console for this infrastructure provider'),
147-
N_('Native Console'),
146+
N_('Open a management console for this infrastructure provider'),
147+
N_('Management Console'),
148148
:keepSpinner => true,
149149
:url => "launch_console",
150-
:confirm => N_("Open native console for this provider"),
151-
:klass => ApplicationHelper::Button::NativeConsole,
150+
:confirm => N_("Open management console for this provider"),
151+
:klass => ApplicationHelper::Button::ManagementConsole,
152152
:popup => true
153153
)
154154
]

app/helpers/application_helper/toolbar/ems_physical_infra_center.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ class ApplicationHelper::Toolbar::EmsPhysicalInfraCenter < ApplicationHelper::To
9292
:keepSpinner => true,
9393
:url => "launch_console",
9494
:confirm => N_("Open management console for this provider"),
95-
:klass => ApplicationHelper::Button::NativeConsole,
95+
:klass => ApplicationHelper::Button::ManagementConsole,
9696
:options => {:feature => :console})
9797
]
9898
),

app/helpers/application_helper/toolbar/x_vm_center.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -309,14 +309,14 @@ class ApplicationHelper::Toolbar::XVmCenter < ApplicationHelper::Toolbar::Basic
309309
:klass => ApplicationHelper::Button::VmNativeConsole
310310
),
311311
button(
312-
:vm_native_console,
312+
:vm_management_console,
313313
'pficon pficon-screen fa-lg',
314314
N_('Open a management console for this VM'),
315315
N_('Management Console'),
316316
:keepSpinner => true,
317317
:url => "management_console",
318318
:klass => ApplicationHelper::Button::VmManagementConsole,
319-
:options => {:feature => :native_console}
319+
:options => {:feature => :management_console}
320320
),
321321
]
322322
),

0 commit comments

Comments
 (0)