From 5ed9a51bcfb3b367358688185c8f3942ffaee401 Mon Sep 17 00:00:00 2001
From: Alex Sorokin <alex@crowdflower.com>
Date: Tue, 29 Nov 2011 08:26:07 -0800
Subject: [PATCH 1/4] Fix a display issue when a worker's job is empty and it
 tries to sort on nil

---
 lib/resque/server/views/working.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/resque/server/views/working.erb b/lib/resque/server/views/working.erb
index 6165cfdd4..4f72686d1 100644
--- a/lib/resque/server/views/working.erb
+++ b/lib/resque/server/views/working.erb
@@ -31,7 +31,7 @@
     workers = resque.working
     jobs = workers.collect {|w| w.job }
     worker_jobs = workers.zip(jobs)
-    worker_jobs = worker_jobs.reject { |w, j| w.idle? }
+    worker_jobs = worker_jobs.reject { |w, j| w.idle? || job.empty? }
   %>
 
   <h1 class='wi'><%= worker_jobs.size %> of <%= resque.workers.size %> Workers Working</h1>
@@ -49,7 +49,7 @@
     </tr>
     <% end %>
 
-    <% worker_jobs.sort_by {|w, j| j['run_at'] ? j['run_at'] : '' }.each do |worker, job| %>
+    <% worker_jobs.sort_by {|w, j| j['run_at'] || '' }.each do |worker, job| %>
       <tr>
         <td class='icon'><img src="<%=u state = worker.state %>.png" alt="<%= state %>" title="<%= state %>"></td>
         <% host, pid, queues = worker.to_s.split(':') %>

From 3f429f7f52d2b6e46de3bf75018efd0786f7021d Mon Sep 17 00:00:00 2001
From: Alex Sorokin <alex@crowdflower.com>
Date: Tue, 29 Nov 2011 08:38:58 -0800
Subject: [PATCH 2/4] Bump version

---
 lib/resque/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/resque/version.rb b/lib/resque/version.rb
index 40e013a90..56deb75a5 100644
--- a/lib/resque/version.rb
+++ b/lib/resque/version.rb
@@ -1,3 +1,3 @@
 module Resque
-  Version = VERSION = '1.19.0'
+  Version = VERSION = '1.19.100' #100+ are downstream patches
 end

From ceee326f00fcab38d0f4fdfdf6f7f3e0dc46406e Mon Sep 17 00:00:00 2001
From: Alex Sorokin <alex@crowdflower.com>
Date: Tue, 29 Nov 2011 12:29:02 -0800
Subject: [PATCH 3/4] Revert "Fix a display issue when a worker's job is empty
 and it tries to sort on nil"

This reverts commit 5ed9a51bcfb3b367358688185c8f3942ffaee401.
---
 lib/resque/server/views/working.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/resque/server/views/working.erb b/lib/resque/server/views/working.erb
index 4f72686d1..6165cfdd4 100644
--- a/lib/resque/server/views/working.erb
+++ b/lib/resque/server/views/working.erb
@@ -31,7 +31,7 @@
     workers = resque.working
     jobs = workers.collect {|w| w.job }
     worker_jobs = workers.zip(jobs)
-    worker_jobs = worker_jobs.reject { |w, j| w.idle? || job.empty? }
+    worker_jobs = worker_jobs.reject { |w, j| w.idle? }
   %>
 
   <h1 class='wi'><%= worker_jobs.size %> of <%= resque.workers.size %> Workers Working</h1>
@@ -49,7 +49,7 @@
     </tr>
     <% end %>
 
-    <% worker_jobs.sort_by {|w, j| j['run_at'] || '' }.each do |worker, job| %>
+    <% worker_jobs.sort_by {|w, j| j['run_at'] ? j['run_at'] : '' }.each do |worker, job| %>
       <tr>
         <td class='icon'><img src="<%=u state = worker.state %>.png" alt="<%= state %>" title="<%= state %>"></td>
         <% host, pid, queues = worker.to_s.split(':') %>

From 8ad134c5e0969e2e49dcb77b5396041f8d01277c Mon Sep 17 00:00:00 2001
From: Alex Sorokin <alex@crowdflower.com>
Date: Tue, 29 Nov 2011 08:26:07 -0800
Subject: [PATCH 4/4] Fix a display issue when a worker's job is empty and it
 tries to sort on nil

---
 lib/resque/server/views/working.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/resque/server/views/working.erb b/lib/resque/server/views/working.erb
index 6165cfdd4..58b6f6391 100644
--- a/lib/resque/server/views/working.erb
+++ b/lib/resque/server/views/working.erb
@@ -31,7 +31,7 @@
     workers = resque.working
     jobs = workers.collect {|w| w.job }
     worker_jobs = workers.zip(jobs)
-    worker_jobs = worker_jobs.reject { |w, j| w.idle? }
+    worker_jobs = worker_jobs.reject { |w, j| w.idle? || j.empty? }
   %>
 
   <h1 class='wi'><%= worker_jobs.size %> of <%= resque.workers.size %> Workers Working</h1>
@@ -49,7 +49,7 @@
     </tr>
     <% end %>
 
-    <% worker_jobs.sort_by {|w, j| j['run_at'] ? j['run_at'] : '' }.each do |worker, job| %>
+    <% worker_jobs.sort_by {|w, j| j['run_at'] || '' }.each do |worker, job| %>
       <tr>
         <td class='icon'><img src="<%=u state = worker.state %>.png" alt="<%= state %>" title="<%= state %>"></td>
         <% host, pid, queues = worker.to_s.split(':') %>