projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 2903-remove-pi-active-and-success
[arvados.git]
/
services
/
api
/
app
/
views
/
pipeline_instances
/
index.html.erb
diff --git
a/services/api/app/views/pipeline_instances/index.html.erb
b/services/api/app/views/pipeline_instances/index.html.erb
index e8cb553daff3508fce09b54b903743ed640c366c..cfadd26cdd28ae473b78bf3cc79f26253e8d9e2d 100644
(file)
--- a/
services/api/app/views/pipeline_instances/index.html.erb
+++ b/
services/api/app/views/pipeline_instances/index.html.erb
@@
-19,13
+19,13
@@
<% @objects.each do |o| %>
<% @objects.each do |o| %>
- <% status =
o.success ? 'success' : (o.success == false
? 'failure' : 'pending') %>
+ <% status =
(o.state == 'Complete') ? 'success' : ((o.state == 'Failed')
? 'failure' : 'pending') %>
<tr class="pipeline-instance-status pipeline-instance-status-<%= status %>" data-showhide-selector="tr#extra-info-<%= o.uuid %>" style="cursor:pointer">
<td>
<%= status %>
</td><td>
<tr class="pipeline-instance-status pipeline-instance-status-<%= status %>" data-showhide-selector="tr#extra-info-<%= o.uuid %>" style="cursor:pointer">
<td>
<%= status %>
</td><td>
- <%=
o.active
? 'yes' : '-' %>
+ <%=
(o.state == 'RunningOnServer')
? 'yes' : '-' %>
</td><td>
<%= (o.progress_ratio * 1000).floor / 10 %>
</td><td>
</td><td>
<%= (o.progress_ratio * 1000).floor / 10 %>
</td><td>