projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
11002: Merge branch 'master' into 11002-arvput-crash-fix
[arvados.git]
/
apps
/
workbench
/
app
/
views
/
pipeline_instances
/
_show_components_running.html.erb
diff --git
a/apps/workbench/app/views/pipeline_instances/_show_components_running.html.erb
b/apps/workbench/app/views/pipeline_instances/_show_components_running.html.erb
index 566e3d771e12796b8d8ebb7e273e34fe499def33..a4eb6ffb2abad2b959c9bfe48718d5f951227b59 100644
(file)
--- a/
apps/workbench/app/views/pipeline_instances/_show_components_running.html.erb
+++ b/
apps/workbench/app/views/pipeline_instances/_show_components_running.html.erb
@@
-66,7
+66,7
@@
<%
cputime = pipeline_jobs.map { |j|
if j[:job][:started_at]
<%
cputime = pipeline_jobs.map { |j|
if j[:job][:started_at]
- (j[:job][:runtime_constraints].andand[:min_nodes] || 1) * ((j[:job][:finished_at] || Time.now()) - j[:job][:started_at])
+ (j[:job][:runtime_constraints].andand[:min_nodes] || 1)
.to_i
* ((j[:job][:finished_at] || Time.now()) - j[:job][:started_at])
else
0
end
else
0
end
@@
-97,5
+97,5
@@
%>
<% pipeline_jobs.each_with_index do |pj, i| %>
%>
<% pipeline_jobs.each_with_index do |pj, i| %>
- <%= render partial: 'running_component', locals: {pj: pj, i: i, expanded: false} %>
+ <%= render partial: 'running_component', locals: {pj: pj, i: i, expanded: false
, pipeline_display: true
} %>
<% end %>
<% end %>