projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '3118-docker-fixes'
[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 56e85dbd792269362c880f85626d14a50e48c996..35d28d542b05ad8a9c71a94fc43fd1f5928d47f9 100644
(file)
--- a/
apps/workbench/app/helpers/pipeline_instances_helper.rb
+++ b/
apps/workbench/app/helpers/pipeline_instances_helper.rb
@@
-22,7
+22,7
@@
module PipelineInstancesHelper
pj
end
pj
end
- def pip
i
eline_log_history(job_uuids)
+ def pipeline_log_history(job_uuids)
results = []
log_history = Log.where(event_type: 'stderr',
results = []
log_history = Log.where(event_type: 'stderr',
@@
-82,17
+82,22
@@
module PipelineInstancesHelper
end
if pj[:job][:success]
pj[:result] = 'complete'
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[: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[:failed] = true
elsif pj[:job][:started_at]
pj[:result] = 'running'
+ pj[:labeltype] = 'primary'
elsif pj[:job][:uuid]
pj[:result] = 'queued'
elsif pj[:job][:uuid]
pj[:result] = 'queued'
+ pj[:labeltype] = 'default'
else
pj[:result] = 'none'
else
pj[:result] = 'none'
+ pj[:labeltype] = 'default'
end
pj[:job_id] = pj[:job][:uuid]
pj[:script] = pj[:job][:script] || c[:script]
end
pj[:job_id] = pj[:job][:uuid]
pj[:script] = pj[:job][:script] || c[:script]