Signed-off-by: Amos Benari <abenari@redhat.com>
···
--- app/helpers/hosts_helper.rb | 2 +- app/views/hosts/_list.html.erb | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-)diff --git a/app/helpers/hosts_helper.rb b/app/helpers/hosts_helper.rb
index be0cc34…54a04b6 100644
— a/app/helpers/hosts_helper.rb
+++ b/app/helpers/hosts_helper.rb
@@ -52,7 +52,7 @@ module HostsHelper
short = "O"
end
content_tag(:span, short, {:rel => “twipsy”, :class => "label " + style, :“data-original-title” => label} ) +
-
link_to(" " + record.shortname, host_path(record),{:rel=>"twipsy", :"data-original-title"=>record})
-
link_to(" " + record.name, host_path(record),{:rel=>"twipsy", :"data-original-title"=>record})end
def days_ago time
diff --git a/app/views/hosts/_list.html.erb b/app/views/hosts/_list.html.erb
index c65de85…ef21aae 100644
— a/app/views/hosts/_list.html.erb
+++ b/app/views/hosts/_list.html.erb
@@ -3,12 +3,12 @@
| <%= check_box_tag "check_all", "", false, { :onclick => "toggleCheck()", :title => "Select All" } %> | -<%= sort :name %> | -<%= sort :os, :as => "Operating system" %> | -<%= sort :environment %> | +<%= sort :name %> | +<%= sort :os, :as => "Operating System" %> |
+ <%= sort :environment %> | <%= sort :model %> | -<%= sort :hostgroup, :as => "Host Group" %> | -<%= sort :last_report %> | +<%= sort :hostgroup, :as => "Host Group" %> | +<%= sort :last_report %> | <%= check_box_tag "host_ids[]", nil, false, :id => "host_ids_#{host.id}", :disabled => !authorized?, :class => 'host_select_boxes', :onclick => 'hostChecked(this)' -%> | -<%= name_column(host) %> | -<%= icon(host.os, :size => "18x18", :title => host.os.to_s) + " " + host.os.to_s if host.os %> | -<%= h host.try(:environment) %> | +<%= name_column(host) %> | +<%= icon(host.os, :size => "18x18", :title => host.os.to_s) + " " + host.os.to_s if host.os %> | +<%= h host.try(:environment) %> | <%= h host.try(:model) %> | -<%= hostgroup_name host.hostgroup %> | -<%= last_report_column(host) %> | +<%= hostgroup_name host.hostgroup %> | +<%= last_report_column(host) %> | <%= display_link_if_authorized 'Edit', hash_for_edit_host_path(:id => host) %> <%= display_link_if_authorized 'Clone', hash_for_clone_host_path(:id => host) %> -- 1.7.4.2 |
|---|