5198: Remove href attributes from remote:true links to prevent ctrl-click et al....

[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 b03726741a14aec13558d10c32edb06e501e599f..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,20 +19,4 @@ module JobsHelper
     return results
   end
 
-  def stderr_log_records(job_uuids, extra_filters = nil)
-    filters = [["event_type",  "=", "stderr"],
-               ["object_uuid", "in", job_uuids]]
-    filters += extra_filters if extra_filters
-    last_entry = Log.select(%w(event_at)).order('id DESC').limit(1).filter(filters).results.first
-    if last_entry
-      filters += [["event_at", ">=", last_entry.event_at - 10.minutes]]
-      Log.select(%w(event_type object_uuid event_at properties))
-         .order('id DESC')
-         .filter(filters)
-         .results
-    else
-      []
-    end
-  end
-
 end