11684: Merge branch 'master' into 11684-unsigned-locator-fix

[arvados.git] / apps / workbench / app / views / work_units / _show_child.html.erb

diff --git a/apps/workbench/app/views/work_units/_show_child.html.erb b/apps/workbench/app/views/work_units/_show_child.html.erb
index 03bb518301a32fefe8c7c788fab4985a622171f3..aad7d7bf2a21707fad3935a84f02bc958baad804 100644 (file)
--- a/apps/workbench/app/views/work_units/_show_child.html.erb
+++ b/apps/workbench/app/views/work_units/_show_child.html.erb
@@ -18,10 +18,11 @@
         <% else %>
           <% walltime = current_obj.walltime %>
           <% cputime = current_obj.cputime %>
+          <% runningtime = current_obj.runningtime %>
           <div class="col-md-3">
           <% if walltime and cputime %>
-            <%= render_runtime(walltime, false) %>
-            <% if cputime > 0 %> / <%= render_runtime(cputime, false) %> (<%= (cputime/walltime).round(1) %>&Cross;)<% end %>
+            <%= render_runtime([walltime, runningtime].max, false) %>
+            <% if cputime > 0 %> / <%= render_runtime(cputime, false) %> (<%= (cputime/runningtime).round(1) %>&Cross;)<% end %>
           <% end %>
           </div>