Revision 46adbbba
Added by Tomer Brisker about 8 years ago
app/helpers/compute_resources_helper.rb | ||
---|---|---|
module ComputeResourcesHelper
|
||
include LookupKeysHelper
|
||
|
||
def show_console_action(state, link)
|
||
state ? link : ""
|
||
end
|
||
|
||
def vm_state(vm)
|
||
if vm.state == 'PAUSED'
|
||
' ' + _("Paused")
|
app/views/compute_resources_vms/index/_vmware.html.erb | ||
---|---|---|
</td>
|
||
<td>
|
||
<%= action_buttons(vm_power_action(vm, authorizer),
|
||
show_console_action(vm.ready?, display_link_if_authorized("Console", hash_for_console_compute_resource_vm_path(:compute_resource_id => @compute_resource, :id => vm.identity).merge(:auth_object => @compute_resource, :authorizer => authorizer))),
|
||
(display_link_if_authorized("Console", hash_for_console_compute_resource_vm_path(:compute_resource_id => @compute_resource, :id => vm.identity).merge(:auth_object => @compute_resource, :authorizer => authorizer)) if vm.ready?),
|
||
display_delete_if_authorized(hash_for_compute_resource_vm_path(:compute_resource_id => @compute_resource, :id => vm.identity).merge(:auth_object => @compute_resource, :authorizer => authorizer))) %>
|
||
</td>
|
||
</tr>
|
app/views/compute_resources_vms/show.html.erb | ||
---|---|---|
|
||
<%
|
||
all_actions = available_actions(@vm).push(
|
||
show_console_action(@vm.ready?,
|
||
link_to_if_authorized(_("Console"), hash_for_console_compute_resource_vm_path.merge(:auth_object => @compute_resource), {:disabled => @vm.nil? || !@vm.ready?, :class => "btn btn-info"})),
|
||
(link_to_if_authorized(_("Console"), hash_for_console_compute_resource_vm_path.merge(:auth_object => @compute_resource), {:disabled => @vm.nil? || !@vm.ready?, :class => "btn btn-info"}) if @vm.ready?),
|
||
display_link_if_authorized(_("Associate VM"), hash_for_associate_compute_resource_vm_path(:compute_resource_id => @compute_resource, :id => @vm.identity).merge(:auth_object => @compute_resource, :permission => 'edit_compute_resources'), :title=> _("Associate VM to a Foreman host"), :method => :put, :class=>"btn btn-default"),
|
||
link_to(_("Back"), compute_resource_path(@compute_resource), :class=>'btn btn-default'))
|
||
title_actions *all_actions
|
Also available in: Unified diff
Fixes #14566 - remove show_console_action function
The `show_console_action` function is just a trenary operator, no sense
making this a function. This also causes the link to be generated even
if it is not needed, as it is passed to the function as a parameter.