Merge branch 'master' into 3408-production-datamanager

[arvados.git] / apps / workbench / app / helpers / jobs_helper.rb

diff --git a/apps/workbench/app/helpers/jobs_helper.rb b/apps/workbench/app/helpers/jobs_helper.rb
index 22d74c131e7f38047bb280e54a2a3f4fe0cff9e4..06c3d0d4206a554fd84539fb9275054ce55166e6 100644 (file)
--- a/apps/workbench/app/helpers/jobs_helper.rb
+++ b/apps/workbench/app/helpers/jobs_helper.rb
@@ -2,9 +2,10 @@ module JobsHelper
   def stderr_log_history(job_uuids)
     results = []
 
-    log_history = stderr_log_records(job_uuids)
-    if !log_history.empty?
-      reversed_results = log_history.reverse
+    log_history = Log.where(event_type: 'stderr',
+                            object_uuid: job_uuids).order('id DESC')
+    if !log_history.results.empty?
+      reversed_results = log_history.results.reverse
       reversed_results.each do |entry|
         if entry.andand.properties
           properties = entry.properties
@@ -18,9 +19,4 @@ module JobsHelper
     return results
   end
 
-  def stderr_log_records(job_uuids)
-    Log.where(event_type: 'stderr',
-              object_uuid: job_uuids).order('id DESC').results
-  end
-
 end