Project

General

Profile

« Previous | Next » 

Revision 35bed1a6

Added by Ohad Levy over 12 years ago

  • ID 35bed1a66d31dc46458c09e77a3b0b83868dbaa6

Revert "fixes #1183 - make an ESXi server appear in the UI without errors"

This reverts commit 017979ebc84eb91c302d632b7382eedb91259a66.

View differences:

app/views/hypervisors/guests/index.html.erb
<th></th>
<% @guests.each do |guest| -%>
<tr>
<td> <%= link_to_if_authorized guest.name, hash_for_hypervisor_guest_path(:hypervisor_id => @hypervisor, :id => guest.id) %> </td>
<td> <%= link_to_if_authorized guest, hash_for_hypervisor_guest_path(:hypervisor_id => @hypervisor, :id => guest) %> </td>
<td> <%= guest.vcpu %> </td>
<td> <%= number_to_human_size guest.memory*1024 %> </td>
<td> <%= guest.interface.device rescue "N/A" %> </td>
......
<td> <%= guest.volume.pool %> </td>
<td> <%= state(!guest.running?) %> </td>
<td>
<%= display_link_if_authorized "Power#{state(guest.running?)}" , hash_for_power_hypervisor_guest_path(:hypervisor_id => @hypervisor, :id => guest.id), :confirm => 'Are you sure?', :method => :put %>
<%= display_link_if_authorized "Destroy", hash_for_hypervisor_guest_path(:hypervisor_id => @hypervisor, :id => guest.id).merge(:auth_action => :destroy), :confirm => 'Are you sure?', :method => :delete %>
<%= display_link_if_authorized "Power#{state(guest.running?)}" , hash_for_power_hypervisor_guest_path(:hypervisor_id => @hypervisor, :id => guest), :confirm => 'Are you sure?', :method => :put %>
<%= display_link_if_authorized "Destroy", hash_for_hypervisor_guest_path(:hypervisor_id => @hypervisor, :id => guest).merge(:auth_action => :destroy), :confirm => 'Are you sure?', :method => :delete %>
</td>
</tr>
<% end -%>
app/views/hypervisors/guests/show.html.erb
</div>
<div class="title_action">
<%= display_link_if_authorized "Power#{state(@guest.running?)}", hash_for_power_hypervisor_guest_path(:hypervisor_id => @hypervisor, :id => @guest.id), :confirm => 'Are you sure?', :method => :put %>
<%= display_link_if_authorized "Destroy", hash_for_hypervisor_guest_path(:hypervisor_id => @hypervisor, :id => @guest.id).merge(:auth_action => :destroy), :confirm => 'Are you sure?', :method => :delete %>
<%= display_link_if_authorized "Power#{state(@guest.running?)}", hash_for_power_hypervisor_guest_path(:hypervisor_id => @hypervisor, :id => @guest), :confirm => 'Are you sure?', :method => :put %>
<%= display_link_if_authorized "Destroy", hash_for_hypervisor_guest_path(:hypervisor_id => @hypervisor, :id => @guest).merge(:auth_action => :destroy), :confirm => 'Are you sure?', :method => :delete %>
<%= display_link_if_authorized "Other Guests on this hypervisor", hash_for_hypervisor_guests_path(:hypervisor_id => @hypervisor) %>
</div>
</div>

Also available in: Unified diff