10111: Merge branch 'master' into 10111-collection-labels

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

diff --git a/apps/workbench/app/helpers/pipeline_instances_helper.rb b/apps/workbench/app/helpers/pipeline_instances_helper.rb
index c025e2dba8e9611e468fb7a79144ef8b3a8d0bcb..1ed9e3ed6b6265aab919481f2d8a9920296b08b1 100644 (file)
--- a/apps/workbench/app/helpers/pipeline_instances_helper.rb
+++ b/apps/workbench/app/helpers/pipeline_instances_helper.rb
@@ -69,8 +69,8 @@ module PipelineInstancesHelper
   def determine_wallclock_runtime jobs
     timestamps = []
     jobs.each do |j|
-      started_at = j.started_at
-      finished_at = (if j.finished_at then j.finished_at else Time.now end)
+      started_at = (j.started_at if j.respond_to?(:started_at)) || (j[:started_at] if j.is_a?(Hash))
+      finished_at = (j.finished_at if j.respond_to?(:finished_at)) || (j[:finished_at] if j.is_a?(Hash)) || Time.now
       if started_at
         timestamps = merge_range timestamps, started_at, finished_at
       end