[ARVADOS] updated: 1.3.0-1088-g466ae87ff

Git user git at public.curoverse.com
Mon Jun 17 13:37:21 UTC 2019


Summary of changes:
 .../app/views/projects/_container_summary.html.erb | 31 +++++++++++++++-------
 1 file changed, 21 insertions(+), 10 deletions(-)

       via  466ae87ff214d37c0765ee64845941adcbae8af4 (commit)
      from  1cf8673787f9aa62d2a63212522f883c867219af (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 466ae87ff214d37c0765ee64845941adcbae8af4
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Mon Jun 17 09:37:05 2019 -0400

    15087: Add links to the oldest/longest running container
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/apps/workbench/app/views/projects/_container_summary.html.erb b/apps/workbench/app/views/projects/_container_summary.html.erb
index 1a411afc9..2df4d81c0 100644
--- a/apps/workbench/app/views/projects/_container_summary.html.erb
+++ b/apps/workbench/app/views/projects/_container_summary.html.erb
@@ -3,28 +3,39 @@
 SPDX-License-Identifier: AGPL-3.0 %>
 
 <div class="compute-summary-numbers">
-    <table>
+  <table>
       <colgroup>
         <col width="50%">
         <col width="50%">
       </colgroup>
       <tr>
-	<% pending_containers = Container.order("modified_at asc").filter([["state", "in", ["Queued", "Locked"]], ["priority", ">", 0]]).limit(1) %>
+        <th>Pending containers</th>
+	<th>Running containers</th>
+      </tr>
+      <tr>
+	<% pending_containers = Container.order("created_at asc").filter([["state", "in", ["Queued", "Locked"]], ["priority", ">", 0]]).limit(1) %>
 	<% running_containers = Container.order("started_at asc").where(state: "Running").limit(1) %>
         <td><%= pending_containers.items_available %></td>
         <td><%= running_containers.items_available %></td>
       </tr>
       <tr>
-        <th>Pending containers</th>
-        <th>Running containers</th>
+	<th>Oldest pending</th>
+	<th>Longest running</th>
       </tr>
       <tr>
-        <th><%= if pending_containers.first then render_runtime(Time.now - pending_containers.first.modified_at, false, false) else "-" end %></th>
-        <th><%= if running_containers.first then render_runtime(Time.now - running_containers.first.started_at, false, false) else "-" end %></th>
-      </tr>
-      <tr>
-        <th>Oldest pending</th>
-        <th>Longest running</th>
+        <td><% if pending_containers.first then %>
+	    <%= link_to_if_arvados_object pending_containers.first, link_text: render_runtime(Time.now - pending_containers.first.created_at, false, false) %>
+	  <% else %>
+	    -
+	  <% end %>
+	</td>
+
+        <td><% if running_containers.first then %>
+	    <%= link_to_if_arvados_object running_containers.first, link_text: render_runtime(Time.now - running_containers.first.created_at, false, false) %>
+	  <% else %>
+	    -
+	  <% end %>
+	</td>
       </tr>
     </table>
 

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list