Respect running_job_log_records_to_fetch in JobsController#logs.

[arvados.git] / apps / workbench / app / controllers / application_controller.rb

diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb
index dfa5ebc95c277127b42649fd4f2c141b22490118..648cae85a67006dc46e2410f3b7e3afc99637f8e 100644 (file)
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@ -115,7 +115,7 @@ class ApplicationController < ActionController::Base
   # Column names should always be qualified by a table name and a direction is optional, defaulting to asc
   # (e.g. "collections.name" or "collections.name desc").
   # If a column name is specified, that table will be sorted by that column.
-  # If there are objects from different models that will be shown (such as in Jobs and Pipelines tab),
+  # If there are objects from different models that will be shown (such as in Pipelines and processes tab),
   # then a sort column name can optionally be specified for each model, passed as an comma-separated list (e.g. "jobs.script, pipeline_instances.name")
   # Currently only one sort column name and direction can be specified for each model.
   def load_filters_and_paging_params
@@ -835,12 +835,9 @@ class ApplicationController < ActionController::Base
     pipelines = PipelineInstance.limit(lim).order(["created_at desc"])
 
     crs = ContainerRequest.limit(lim).order(["created_at desc"]).filter([["requesting_container_uuid", "=", nil]])
-    cr_uuids = crs.results.collect { |c| c.container_uuid }
-    containers = Container.order(["created_at desc"]).results if cr_uuids.any?
-
     procs = {}
     pipelines.results.each { |pi| procs[pi] = pi.created_at }
-    containers.each { |c| procs[c] = c.created_at } if !containers.nil?
+    crs.results.each { |c| procs[c] = c.created_at }
 
     Hash[procs.sort_by {|key, value| value}].keys.reverse.first(lim)
   end