X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/7538d084fa8778289053f62a6fb8d3ea04868258..b92203411f6f6adaef1c2af62495830f13f4fa14:/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 80210c4360..63075f7e66 100644 --- 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 @@ -99,8 +100,7 @@ <% # link to repo tree/file only if the repo is readable # and the commit is a sha1... repo = - (not Repository.disable_repository_browsing? and - /^[0-9a-f]{40}$/ =~ current_component[:script_version] and + (/^[0-9a-f]{40}$/ =~ current_component[:script_version] and Repository.where(name: current_component[:repository]).first) # ...and the api server provides an http:// or https:// url