X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/44c95f99098fa6c6acbfa82d4b6cbc6015eb6e39..f1aec3387f765a3f8a2f3f2c22d3a53fb4f9f1f3:/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 2142375226..8e89331cb6 100644 --- a/apps/workbench/app/helpers/pipeline_instances_helper.rb +++ b/apps/workbench/app/helpers/pipeline_instances_helper.rb @@ -92,7 +92,7 @@ module PipelineInstancesHelper c[:job][:uuid] if c.is_a?(Hash) and c[:job].is_a?(Hash) }.compact job = {} - Job.where(uuid: jobuuids).each do |j| + Job.where(uuid: jobuuids).with_count("none").each do |j| job[j[:uuid]] = j end @@ -207,7 +207,7 @@ module PipelineInstancesHelper end else if step[:progress] and - (re = step[:progress].match /^(\d+)\+(\d+)\/(\d+)$/) + (re = step[:progress].match(/^(\d+)\+(\d+)\/(\d+)$/)) pj[:progress] = (((re[1].to_f + re[2].to_f/2) / re[3].to_f) rescue 0.5) else pj[:progress] = 0.0