simplified mux lookup, added last change date per package in host view

app/controllers/hosts_controller.rb

@@ -10,8 +10,8 @@ def index
 
   def show
     @host = Host.find(params[:id])
-    @search = Package.search params[:search]
-    @packages = @search.paginate(:conditions => {:muxes => {:host_id => @host}}, :joins => :muxes, :page => params[:page], :order => :name).uniq
+    @search = Mux.search params[:search]
+    @muxes = @search.paginate(:conditions => {:host_id => @host}, :joins => [:package, :version, :arch], :page => params[:page])
   end
 
   def new

app/models/host.rb

@@ -10,12 +10,4 @@ def to_s
     name
   end
 
-  def package_details pkg
-    a = []
-    Mux.all(:conditions => {:host_id => self, :package_id => pkg}, :include => [:version, :arch]).each do |m|
-      a << "#{m.version}(#{m.arch})"
-    end
-    return a
-  end
-
 end

app/views/common/_search.html.erb

@@ -1,6 +1,7 @@
 <span class=pagination>
+  <% value ||= "name_like" -%>
 <% form_for @search do |f|-%>
-  <%= f.text_field :name_like, :size => 10 %>
+  <%= f.text_field value, :size => 10 %>
   <%= f.submit "Search" %>
 <% end %>
 </span>

app/views/hosts/show.html.erb

@@ -1,21 +1,25 @@
 <% title "#{h @host.name} (#{@host.os})" %>
-<%= render "common/search" %>
+<%= render "common/search", :value => :package_name_like %>
 <table>
   <tr>
     <th>Package</th>
-    <th>Version(arch)</th>
+    <th>Version</th>
+    <th>Arch</th>
+    <th>Last changed</th>
   </tr>
-  <% for package in @packages -%>
+  <% for mux in @muxes -%>
     <tr>
-      <td><%= link_to h(package), package_path(package) %></td>
-      <td> <%= h @host.package_details(package).to_sentence %></td>
+      <td><%= link_to h(mux.package), package_path(mux.package) %></td>
+      <td><%= h mux.version %></td>
+      <td><%= h mux.arch %></td>
+      <td><%= time_ago_in_words mux.updated_at %></td>
     </tr>
   <% end -%>
 </table>
-<%= page_entries_info @packages %>
-<%= will_paginate @packages %>
+<%= page_entries_info @muxes %>
+<%= will_paginate @muxes %>
 
 <p>
 <%= link_to "View All", hosts_path %>
-<span class="pagination">last updated at <%= @host.updated_at %></span>
+<span class="pagination">last updated <%= time_ago_in_words @host.updated_at %> ago</span>
 </p>