Web UI: Sort workers, don't always show subtabs

ctrochalakis · Aug 24, 2010 · 1852cea · 1852cea
1 parent aba6f6f
commit 1852cea
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/resque/server/views/queues.erb b/lib/resque/server/views/queues.erb
@@ -1,4 +1,4 @@
-<% @subtabs = resque.queues unless partial? %>
+<% @subtabs = resque.queues unless partial? || params[:id].nil? %>
 
 <% if queue = params[:id] %>
 

diff --git a/lib/resque/server/views/workers.erb b/lib/resque/server/views/workers.erb
@@ -85,15 +85,15 @@
   <%=poll%>
 
 <% else %>
-
+  <% @subtabs = [] %>
   <h1 class='wi'>Workers</h1>
   <p class='intro'>The hostnames below all have registered workers. Select a hostname to view its workers, or "all" to see all workers.</p>
   <table class='queues'>
     <tr>
       <th>Hostname</th>
       <th>Workers</th>
     </tr>
-    <% for hostname, workers in worker_hosts %>
+    <% for hostname, workers in worker_hosts.sort_by { |h,w| h } %>
     <tr>
       <td class='queue'><a class="queue" href="<%= url "workers/#{hostname}" %>"><%= hostname %></a></td>
       <td class='size'><%= workers.size %></td>