Skip to content

Commit

Permalink
Middelware server group power ops: rubocop
Browse files Browse the repository at this point in the history
  • Loading branch information
@jkremser
jkremser committed Feb 2, 2017
1 parent 6adf609 commit 7b2ad85
Show file tree
Hide file tree
Showing 4 changed files with 81 additions and 75 deletions.
24 changes: 15 additions & 9 deletions app/controllers/middleware_server_group_controller.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,18 +51,24 @@ def run_operation
end
operation = ('middleware_server_group_' + params['operation']).to_sym
if OPERATIONS.key?(operation)
operation_info = OPERATIONS.fetch(operation)
triggered = run_specific_operation(operation_info, selected_server_groups)
if triggered
initiated_msg = _('%{operation} initiated for given server group.') % {:operation => operation_info.fetch(:msg)}
render :json => {:status => :ok, :msg => initiated_msg}
else
fail_msg = _('%{operation} was not initiated for given group.') % {:operation => operation_info.fetch(:msg)}
render :json => {:status => :error, :msg => fail_msg}
end
do_run_operation(operation, selected_server_groups)
else
msg = _('Unknown server group operation: ') + operation.to_s
render :json => {:status => :error, :msg => msg}
end
end

private

def do_run_operation(operation, selected_server_groups)
operation_info = OPERATIONS.fetch(operation)
triggered = run_specific_operation(operation_info, selected_server_groups)
if triggered
initiated_msg = _('%{operation} initiated for given server group.') % {:operation => operation_info.fetch(:msg)}
render :json => {:status => :ok, :msg => initiated_msg}
else
fail_msg = _('%{operation} was not initiated for given group.') % {:operation => operation_info.fetch(:msg)}
render :json => {:status => :error, :msg => fail_msg}
end
end
end
128 changes: 64 additions & 64 deletions app/helpers/application_helper/toolbar/middleware_server_group_center.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,70 +17,70 @@ class ApplicationHelper::Toolbar::MiddlewareServerGroupCenter < ApplicationHelpe
),
])
button_group('middleware_server_operations', [
select(
:middleware_server_power_choice,
'fa fa-power-off fa-lg',
t = N_('Power'),
t,
:items => [
button(
:middleware_server_group_restart,
nil,
N_('Restart Servers in this Server Group'),
N_('Restart Server Group'),
:image => 'restart',
:confirm => N_('Do you want to restart this server group?'),
),
separator,
button(
:middleware_server_group_stop,
nil,
N_('Stop Servers in this Server Group'),
N_('Stop Server Group'),
:image => 'power_off',
:data => {'toggle' => 'modal',
'target' => '#modal_param_div',
'function' => 'sendDataWithRx',
'function-data' => '{"type": "mwServerOps", "operation": "stop", "timeout": 10}'},
),
button(
:middleware_server_group_suspend,
nil,
N_('Suspend Server in this Server Group'),
N_('Suspend Server Group'),
:image => 'suspend',
:data => {'toggle' => 'modal',
'target' => '#modal_param_div',
'function' => 'sendDataWithRx',
'function-data' => '{"type": "mwServerOps", "operation": "suspend", "timeout": 10}'},
),
button(
:middleware_server_group_resume,
nil,
N_('Resume Servers in this Server Group'),
N_('Resume Server Group'),
:image => 'resume',
:confirm => N_('Do you want to resume this server group?'),
),
button(
:middleware_server_group_reload,
nil,
N_('Reload Servers in this Server Group'),
N_('Reload Server Group'),
:confirm => N_('Do you want to trigger a reload of this server group?'),
:image => 'guest_restart',
),
button(
:middleware_server_group_start,
nil,
N_('Start Servers in this Server Group'),
N_('Start Server Group'),
:image => 'start',
:confirm => N_('Do you want to trigger a start of this server group?'),
),
]
),
])
select(
:middleware_server_power_choice,
'fa fa-power-off fa-lg',
t = N_('Power'),
t,
:items => [
button(
:middleware_server_group_restart,
nil,
N_('Restart Servers in this Server Group'),
N_('Restart Server Group'),
:image => 'restart',
:confirm => N_('Do you want to restart this server group?'),
),
separator,
button(
:middleware_server_group_stop,
nil,
N_('Stop Servers in this Server Group'),
N_('Stop Server Group'),
:image => 'power_off',
:data => {'toggle' => 'modal',
'target' => '#modal_param_div',
'function' => 'sendDataWithRx',
'function-data' => '{"type": "mwServerOps", "operation": "stop", "timeout": 10}'},
),
button(
:middleware_server_group_suspend,
nil,
N_('Suspend Server in this Server Group'),
N_('Suspend Server Group'),
:image => 'suspend',
:data => {'toggle' => 'modal',
'target' => '#modal_param_div',
'function' => 'sendDataWithRx',
'function-data' => '{"type": "mwServerOps", "operation": "suspend", "timeout": 10}'},
),
button(
:middleware_server_group_resume,
nil,
N_('Resume Servers in this Server Group'),
N_('Resume Server Group'),
:image => 'resume',
:confirm => N_('Do you want to resume this server group?'),
),
button(
:middleware_server_group_reload,
nil,
N_('Reload Servers in this Server Group'),
N_('Reload Server Group'),
:confirm => N_('Do you want to trigger a reload of this server group?'),
:image => 'guest_restart',
),
button(
:middleware_server_group_start,
nil,
N_('Start Servers in this Server Group'),
N_('Start Server Group'),
:image => 'start',
:confirm => N_('Do you want to trigger a start of this server group?'),
),
]
),
])
button_group('middleware_server_deployments', [
select(
:middleware_server_deployments_choice,
Expand Down
2 changes: 1 addition & 1 deletion app/views/middleware_server/show.html.haml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
%ng-form#mw_server_form{"name" => "mw_server_form",
"ng-controller" => "mwServerController",
"novalidate" => "true"}
= render :partial => 'middleware_shared/ops_params', locals: {opsController: 'mwServerOpsController'}
= render :partial => 'middleware_shared/ops_params', :locals => {:opsController => 'mwServerOpsController'}
= render :partial => 'deploy'
= render :partial => 'add_jdbc_driver'
= render :partial => 'add_datasource'
Expand Down
2 changes: 1 addition & 1 deletion app/views/middleware_server_group/show.html.haml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
%ng-form#mw_server_form{"name" => "mw_server_form",
"ng-controller" => "mwServerGroupController",
"novalidate" => "true"}
= render :partial => 'middleware_shared/ops_params', locals: {opsController: 'mwServerGroupOpsController'}
= render :partial => 'middleware_shared/ops_params', :locals => {:opsController => 'mwServerGroupOpsController'}
= render :partial => 'deploy'
:javascript
Expand Down

0 comments on commit 7b2ad85

Please sign in to comment.