Fixes #22107 - Add hosts count to subnet page

theforeman · Jan 2, 2018 · 7f85b5c · 7f85b5c
1 parent 406b3fb
commit 7f85b5c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/app/models/subnet.rb b/app/models/subnet.rb
@@ -223,6 +223,10 @@ def as_json(options = {})
     super({:methods => [:to_label, :type]}.merge(options))
   end
 
+  def hosts_count
+    hosts.authorized(:view_hosts).size
+  end
+
   private
 
   def validate_ranges

diff --git a/app/views/subnets/index.html.erb b/app/views/subnets/index.html.erb
@@ -6,11 +6,12 @@
 <table class="<%= table_css_classes 'table-two-pane table-fixed' %>">
   <thead>
     <tr>
-      <th class="col-md-3"><%= sort :name, :as => s_("Subnet|Name") %></th>
+      <th class="col-md-2"><%= sort :name, :as => s_("Subnet|Name") %></th>
       <th class="col-md-2"><%= sort :network, :as => s_("Subnet|Network") %></th>
       <th class="col-md-3"><%= _("Domains") %></th>
       <th class="col-md-1"><%= sort :vlanid, :as => s_('Subnet|Vlanid') %></th>
       <th class="col-md-2"><%= _("DHCP Proxy") %></th>
+      <th class="col-md-1"><%= _("Hosts") %></th>
       <th><%= _('Actions') %></th>
     </tr>
   </thead>
@@ -22,6 +23,7 @@
         <td class="ellipsis"><%=subnet.domains.map(&:name).to_sentence %></td>
         <td><%=subnet.vlanid %></td>
         <td class="ellipsis"><%=subnet.dhcp %></td>
+        <td><%= link_to subnet.hosts_count, hosts_path(:search => "subnet.name=\"#{subnet}\"") %>
         <td class="col-md-1">
           <%= action_buttons(display_delete_if_authorized(
             hash_for_subnet_path(:id => subnet).