projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
10037: Avoid showing progressbar on Workbench's Dashboard when a container is not...
[arvados.git]
/
apps
/
workbench
/
app
/
views
/
application
/
_pipeline_status_label.html.erb
diff --git
a/apps/workbench/app/views/application/_pipeline_status_label.html.erb
b/apps/workbench/app/views/application/_pipeline_status_label.html.erb
index 020ce81c573aba07d87d7f6eb49e80eb2983fe4a..88722726dc61169f3468cc00b2b2d72af6bfac17 100644
(file)
--- a/
apps/workbench/app/views/application/_pipeline_status_label.html.erb
+++ b/
apps/workbench/app/views/application/_pipeline_status_label.html.erb
@@
-1,11
+1,13
@@
-<% if p.s
uccess
%>
- <span class="label label-success">
finished
</span>
-<% elsif p.s
uccess == false
%>
+<% if p.s
tate == 'Complete'
%>
+ <span class="label label-success">
complete
</span>
+<% elsif p.s
tate == 'Failed'
%>
<span class="label label-danger">failed</span>
<span class="label label-danger">failed</span>
-<% elsif p.
active
%>
+<% elsif p.
state == 'RunningOnServer' || p.state == 'RunningOnClient'
%>
<span class="label label-info">running</span>
<span class="label label-info">running</span>
+<% elsif p.state == 'Paused' %>
+ <span class="label label-default">paused</span>
<% else %>
<% else %>
- <% if
(p.components.select do |k,v| v[:job] end).length == 0
%>
+ <% if
not p.components.values.any? { |c| c[:job] rescue false }
%>
<span class="label label-default">not started</span>
<% else %>
<span class="label label-default">not running</span>
<span class="label label-default">not started</span>
<% else %>
<span class="label label-default">not running</span>