facts_as_necessary.diff

Brian Gallew, 07/01/2010 09:34 PM

Download (1.93 KB)

View differences:

foreman/app/views/hosts/_minilist.html.erb 2010-07-01 13:29:04.000000000 -0700
17 17
            <%= check_box_tag "host_ids[]", host.id, selected?(host), :class => 'host_select_boxes', :onClick => 'insertHostVal(this)' if hosts_controller? -%>
18 18
            <%=name_column(host) %>
19 19
          </td>
20
          <td><%=h host.try(:os) %></td>
21
          <td><%=h host.try(:environment) %></td>
22
          <td><%=h host.try(:model) %></td>
20
          <td><%=h host.try(:os) || host.fv(:operatingsystem) + " " + host.fv(:operatingsystemrelease)%></td>
21
          <td><%=h host.try(:environment) || host.fv(:environment)%></td>
22
          <td><%=h host.try(:model) ||host.fv(:productname) %></td>
23 23
          <td><%=h host.try(:hostgroup) %></td>
24 24
          <td><%=last_report_column(host) %></td>
25 25
          <td>
foreman/app/views/hosts/_overview.html.erb 2010-07-01 12:49:04.000000000 -0700
1 1
<table>
2
  <% [["Domain", host.domain], ["IP Address", host.ip], ["Puppet Environment", host.environment], ["Host Architecture", host.arch],
3
    ["Host Operating System", host.os], ["Host Group", host.hostgroup]].each do |th,td| %>
2
  <% [["Domain", host.domain || host.fv('domain')], 
3
      ["IP Address", host.ip], 
4
      ["Puppet Environment", host.environment || host.fv('environment')], 
5
      ["Host Architecture", host.arch || host.fv('hardwareisa')], 
6
      ["Host Operating System", host.os || host.fv('operatingsystem') + " " + host.fv('operatingsystemrelease')],
7
      ["Host Group", host.hostgroup]].each do |th,td| %>
4 8
    <tr>
5 9
      <th><%= th %></th>
6 10
      <td><%= td %></td>