From 12d63a7d8895d245c059ab3108d4258949df93d5 Mon Sep 17 00:00:00 2001
From: Toks <tttoksss@gmail.com>
Date: Tue, 17 Sep 2013 11:31:11 -0400
Subject: [PATCH] fixes #1096

---
 app/helpers/delayed_jobs_helper.rb    | 47 ++++++++++++++++++++++-----
 app/views/delayed_jobs/index.html.erb |  2 ++
 2 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/app/helpers/delayed_jobs_helper.rb b/app/helpers/delayed_jobs_helper.rb
index 165673d84..382f37e28 100644
--- a/app/helpers/delayed_jobs_helper.rb
+++ b/app/helpers/delayed_jobs_helper.rb
@@ -1,29 +1,60 @@
 module DelayedJobsHelper
+  def print_name(job)
+    case job.name
+    when "Class#expire_cache"
+      "<strong>expire post count cache</strong>"
+
+    when "Upload#process!"
+      "<strong>upload post</strong>"
+
+    when "Tag#update_related"
+      "<strong>update related tags</strong>"
+
+    when "TagAlias#process!"
+      "<strong>alias</strong>"
+
+    when "TagImplication#process!"
+      "<strong>implication</strong>"
+
+    when "Class#clear_cache_for"
+      "<strong>expire tag alias cache</strong>"
+
+    when "Tag#update_category_cache"
+      "<strong>update tag category cache</strong>"
+
+    when "Tag#update_category_post_counts"
+      "<strong>update category post counts</strong>"
+
+    else
+      h(job.name)
+    end
+  end
+
   def print_handler(job)
     case job.name
     when "Class#expire_cache"
-      "<strong>expire post count cache</strong>: " + h(job.payload_object.args.flatten.join(" "))
+      h(job.payload_object.args.flatten.join(" "))
 
     when "Upload#process!"
-      '<strong>upload post</strong>: <a href="/uploads/' + job.payload_object.object.id.to_s + '">record</a>'
+      %{<a href="/uploads/#{job.payload_object.object.id}">record</a>}
 
     when "Tag#update_related"
-      "<strong>update related tags</strong>: " + h(job.payload_object.name)
+      h(job.payload_object.name)
 
     when "TagAlias#process!"
-      '<strong>alias</strong>: ' + h(job.payload_object.antecedent_name) + " -&gt; " + h(job.payload_object.consequent_name)
+      h(job.payload_object.antecedent_name) + " -&gt; " + h(job.payload_object.consequent_name)
 
     when "TagImplication#process!"
-      '<strong>implication</strong>: ' + h(job.payload_object.antecedent_name) + " -&gt; " + h(job.payload_object.consequent_name)
+      h(job.payload_object.antecedent_name) + " -&gt; " + h(job.payload_object.consequent_name)
 
     when "Class#clear_cache_for"
-      "<strong>expire tag alias cache</strong>: " + h(job.payload_object.args.flatten.join(" "))
+      h(job.payload_object.args.flatten.join(" "))
 
     when "Tag#update_category_cache"
-      "<strong>update tag category cache</strong>: " + h(job.payload_object.name)
+      h(job.payload_object.name)
 
     when "Tag#update_category_post_counts"
-      "<strong>update category post counts</strong>: " + h(job.payload_object.name)
+      h(job.payload_object.name)
 
     else
       h(job.handler)
diff --git a/app/views/delayed_jobs/index.html.erb b/app/views/delayed_jobs/index.html.erb
index c7fcb03db..ce87d68dd 100644
--- a/app/views/delayed_jobs/index.html.erb
+++ b/app/views/delayed_jobs/index.html.erb
@@ -4,6 +4,7 @@
   <thead>
     <tr>
       <th>ID</th>
+      <th>Name</th>
       <% if CurrentUser.is_admin? %>
         <th>Handler</th>
       <% end %>
@@ -19,6 +20,7 @@
     <% @delayed_jobs.each do |job| %>
       <tr>
         <td><%= job.id %></td>
+        <td><%= raw print_name(job) %></td>
         <% if CurrentUser.is_admin? %>
           <td><%= raw print_handler(job) %></td>
         <% end %>