Skip to content

Commit

Permalink
It should be possible to run the Power operation on domain server. At…
Browse files Browse the repository at this point in the history
… the same time, hiding the add {deployment|datasource|jdbc_driver} operations for domain servers.
  • Loading branch information
jkremser committed Oct 31, 2016
1 parent e06b9cc commit ab6d7b7
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 2 deletions.
10 changes: 8 additions & 2 deletions app/controllers/middleware_server_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -241,12 +241,18 @@ def run_server_operation(operation_info, items)

def trigger_mw_operation(operation, mw_server, params = nil)
mw_manager = mw_server.ext_management_system
path = mw_server.ems_ref

# in domain mode case we want to run the operation on the server-config DMR resource
if mw_server.in_domain?
path = path.sub(/%2Fserver%3D/, '%2Fserver-config%3D')
end

op = mw_manager.public_method operation
if params
op.call(mw_server.ems_ref, params)
op.call(path, params)
else
op.call mw_server.ems_ref
op.call(path)
end
end
end
4 changes: 4 additions & 0 deletions app/helpers/application_helper/toolbar_builder.rb
Original file line number Diff line number Diff line change
Expand Up @@ -702,6 +702,10 @@ def build_toolbar_hide_button(id)
return true unless @record.provisionable?
end
when 'MiddlewareServer', 'MiddlewareDeployment', 'MiddlewareDatasource'
if %w(middleware_deployment_add middleware_jdbc_driver_add middleware_datasource_add).include?(id) &&
@record.try(:in_domain?)
return true
end
return true if %w(middleware_server_shutdown middleware_server_restart middleware_server_stop
middleware_server_suspend middleware_server_resume middleware_server_reload
middleware_deployment_restart middleware_deployment_disable middleware_deployment_enable
Expand Down
4 changes: 4 additions & 0 deletions app/models/middleware_server.rb
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,8 @@ def evaluate_alert(alert_id, event)
end
false
end

def in_domain?
!middleware_server_group.nil?
end
end

0 comments on commit ab6d7b7

Please sign in to comment.