diff -ur george/app/views/hosts/_minilist.html.erb foreman/app/views/hosts/_minilist.html.erb
--- george/app/views/hosts/_minilist.html.erb 2010-06-07 00:37:58.000000000 -0700
+++ foreman/app/views/hosts/_minilist.html.erb 2010-07-01 13:29:04.000000000 -0700
@@ -17,9 +17,9 @@
<%= check_box_tag "host_ids[]", host.id, selected?(host), :class => 'host_select_boxes', :onClick => 'insertHostVal(this)' if hosts_controller? -%>
<%=name_column(host) %>
-
<%=h host.try(:os) %> |
- <%=h host.try(:environment) %> |
- <%=h host.try(:model) %> |
+ <%=h host.try(:os) || host.fv(:operatingsystem) + " " + host.fv(:operatingsystemrelease)%> |
+ <%=h host.try(:environment) || host.fv(:environment)%> |
+ <%=h host.try(:model) ||host.fv(:productname) %> |
<%=h host.try(:hostgroup) %> |
<%=last_report_column(host) %> |
diff -ur george/app/views/hosts/_overview.html.erb foreman/app/views/hosts/_overview.html.erb
--- george/app/views/hosts/_overview.html.erb 2010-06-07 00:37:58.000000000 -0700
+++ foreman/app/views/hosts/_overview.html.erb 2010-07-01 12:49:04.000000000 -0700
@@ -1,6 +1,10 @@
- <% [["Domain", host.domain], ["IP Address", host.ip], ["Puppet Environment", host.environment], ["Host Architecture", host.arch],
- ["Host Operating System", host.os], ["Host Group", host.hostgroup]].each do |th,td| %>
+ <% [["Domain", host.domain || host.fv('domain')],
+ ["IP Address", host.ip],
+ ["Puppet Environment", host.environment || host.fv('environment')],
+ ["Host Architecture", host.arch || host.fv('hardwareisa')],
+ ["Host Operating System", host.os || host.fv('operatingsystem') + " " + host.fv('operatingsystemrelease')],
+ ["Host Group", host.hostgroup]].each do |th,td| %>
<%= th %> |
<%= td %> |
|