X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/28e0fb829175415c533ea783d90ade8a39bdb236..408e81ed610fa238229150e4a47f457139fcf867:/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 3451923ead..53f3e43da2 100644
--- a/apps/workbench/app/views/work_units/_show_child.html.erb
+++ b/apps/workbench/app/views/work_units/_show_child.html.erb
@@ -1,10 +1,14 @@
+<%# Copyright (C) The Arvados Authors. All rights reserved.
+
+SPDX-License-Identifier: AGPL-3.0 %>
+
 <div class="panel panel-default">
   <div class="panel-heading">
       <div class="row">
         <div class="col-md-3" style="word-break:break-all;">
           <h4 class="panel-title">
             <a class="component-detail-panel" data-toggle="collapse" href="#collapse<%= i %>">
-              <%= current_obj.label %> <span class="caret"></span>
+              <%= current_obj.label %> <span class="caret" href="#collapse<%= i %>"></span>
             </a>
           </h4>
         </div>
@@ -18,10 +22,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>
 
@@ -42,7 +47,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 %>
           </div>
@@ -50,10 +55,8 @@
       </div>
   </div>
 
-  <% name = if current_obj.respond_to?('name') then current_obj.name else '' end %>
-  <% kind = if !@object.is_a?(Hash) then ('arvados#' + @object.class.to_s.camelcase(:lower)) else '' end %>
-  <% content_url = url_for(controller: :work_units, action: :show_child_component, name: name) %>
-  <div id="collapse<%=i%>" class="work-unit-component-detail panel-collapse collapse <%= if expanded then 'in' end %>" content-url="<%=content_url%>" action-data="<%={current_obj_type: current_obj.class.to_s, current_obj: current_obj.proxied, main_obj: @object, main_obj_kind: kind}.to_json%>">
+  <% content_url = url_for(controller: :work_units, action: :show_child_component, id: @object.uuid, object_type: @object.class.to_s) %>
+  <div id="collapse<%=i%>" class="work-unit-component-detail panel-collapse collapse <%= if expanded then 'in' end %>" content-url="<%=content_url%>" action-data="<%={current_obj_type: current_obj.class.to_s, current_obj_uuid: current_obj.uuid, current_obj_name: current_obj.label, current_obj_parent: current_obj.parent}.to_json%>">
     <div class="panel-body work-unit-component-detail-body">
     </div>
   </div>