X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/c95fd352d669bc65c0dbc9970ca11291cc933577..1595481c3e4cc42cfa5a47bbe501eb6e6f83db9f:/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 277aa37852..aad7d7bf2a 100644
--- a/apps/workbench/app/views/work_units/_show_child.html.erb
+++ b/apps/workbench/app/views/work_units/_show_child.html.erb
@@ -4,7 +4,7 @@
@@ -18,10 +18,11 @@
<% else %>
<% walltime = current_obj.walltime %>
<% cputime = current_obj.cputime %>
+ <% runningtime = current_obj.runningtime %>
<% if walltime and cputime %>
- <%= render_runtime(walltime, false) %>
- <% if cputime > 0 %> / <%= render_runtime(cputime, false) %> (<%= (cputime/walltime).round(1) %>⨯)<% end %>
+ <%= render_runtime([walltime, runningtime].max, false) %>
+ <% if cputime > 0 %> / <%= render_runtime(cputime, false) %> (<%= (cputime/runningtime).round(1) %>⨯)<% end %>
<% end %>
@@ -42,7 +43,7 @@
<% if current_obj.can_cancel? and @object.editable? %>
<%= form_tag "#{current_obj.uri}/cancel", remote: true, style: "display:inline; padding-left: 1em" do |f| %>
<%= hidden_field_tag :return_to, url_for(@object) %>
- <%= button_tag "Cancel", {class: 'btn btn-xs btn-danger', id: "cancel-child-button"} %>
+ <%= button_tag "Cancel", {class: 'btn btn-xs btn-warning', id: "cancel-child-button"} %>
<% end %>
<% end %>
@@ -51,7 +52,7 @@
<% content_url = url_for(controller: :work_units, action: :show_child_component, id: @object.uuid, object_type: @object.class.to_s) %>
-