X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/7f7cd27d5fc31dc5bbec7f95905fd394a5b317c7..e398326fea08b53a132086935d24be8dfde1cd47:/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 bb0ff74c34..b282723c88 100644 --- a/apps/workbench/app/helpers/pipeline_instances_helper.rb +++ b/apps/workbench/app/helpers/pipeline_instances_helper.rb @@ -22,7 +22,6 @@ module PipelineInstancesHelper pj end - protected def pipeline_jobs_newschool object @@ -30,9 +29,12 @@ module PipelineInstancesHelper i = -1 object.components.each do |cname, c| - puts cname, c i += 1 pj = {index: i, name: cname} + if not c.is_a?(Hash) + ret << pj + next + end pj[:job] = c[:job].is_a?(Hash) ? c[:job] : {} pj[:percent_done] = 0 pj[:percent_running] = 0 @@ -63,17 +65,22 @@ module PipelineInstancesHelper end if pj[:job][:success] pj[:result] = 'complete' + pj[:labeltype] = 'success' pj[:complete] = true pj[:progress] = 1.0 elsif pj[:job][:finished_at] pj[:result] = 'failed' + pj[:labeltype] = 'danger' pj[:failed] = true elsif pj[:job][:started_at] pj[:result] = 'running' + pj[:labeltype] = 'primary' elsif pj[:job][:uuid] pj[:result] = 'queued' + pj[:labeltype] = 'default' else pj[:result] = 'none' + pj[:labeltype] = 'default' end pj[:job_id] = pj[:job][:uuid] pj[:script] = pj[:job][:script] || c[:script]