6445: update the job status line also to use the job's finished_at time when task...

[arvados.git] / apps / workbench / app / views / pipeline_instances / _running_component.html.erb

diff --git a/apps/workbench/app/views/pipeline_instances/_running_component.html.erb b/apps/workbench/app/views/pipeline_instances/_running_component.html.erb
index 2ab8da1f4ce2d258d8f098c5c78175d6fbcdf713..63075f7e66018ff675cfea93efecbd9aef5243ec 100644 (file)
--- a/apps/workbench/app/views/pipeline_instances/_running_component.html.erb
+++ b/apps/workbench/app/views/pipeline_instances/_running_component.html.erb
@@ -25,7 +25,8 @@
               <% walltime = ((if current_job[:finished_at] then current_job[:finished_at] else Time.now() end) - current_job[:started_at]) %>
               <% cputime = tasks.map { |task|
                    if task.started_at and task.job_uuid == current_job[:uuid]
-                     (if task.finished_at then task.finished_at else Time.now() end) - task.started_at
+                      finished_at = task.finished_at || current_job[:finished_at] || Time.now()
+                      finished_at - task.started_at
                    else
                      0
                    end