Merge pull request huginn#1462 from dsander/fix-job-management

Fix internal jobs being shown as deleted

app/helpers/jobs_helper.rb

@@ -24,8 +24,16 @@ def relative_distance_of_time_in_words(time)
   #
   # Can return nil, or an instance of Agent.
   def agent_from_job(job)
-    if data = YAML.load(job.handler.to_s).try(:job_data)
+    data = YAML.load(job.handler.to_s).try(:job_data)
+    case data['job_class']
+    when 'AgentCheckJob', 'AgentReceiveJob'
       Agent.find_by_id(data['arguments'][0])
+    when 'AgentRunScheduleJob'
+      "Run Agent schedule '#{data['arguments'][0]}'"
+    when 'AgentCleanupExpiredJob'
+      'Run Event cleanup'
+    when 'AgentPropagateJob'
+      'Run Event propagation'
     else
       false
     end

app/views/jobs/index.html.erb

@@ -11,7 +11,7 @@
         <table class='table table-striped events'>
           <tr>
             <th>Status</th>
-            <th>Agent</th>
+            <th>Agent / Job</th>
             <th>Created</th>
             <th>Next Run</th>
             <th>Attempts</th>
@@ -25,6 +25,8 @@
             <td><% case agent = agent_from_job(job)
                    when Agent
                    %><%= link_to(agent.name, agent_path(agent)) %><%
+                   when String
+                   %><%= agent %><%
                    when false
                    %>(system)<%
                    when nil