12197: Show UUID and PDH of trashed collections.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>

diff --git a/apps/workbench/app/views/trash_items/_show_recent_trash.html.erb b/apps/workbench/app/views/trash_items/_show_recent_trash.html.erb
index a78b02fcb10c202876add3e9b7dddecad8fecbcd..d5b23e0660f68e6969e01116a9919d0c77ae9e7f 100644 (file)
--- a/apps/workbench/app/views/trash_items/_show_recent_trash.html.erb
+++ b/apps/workbench/app/views/trash_items/_show_recent_trash.html.erb
@@ -29,12 +29,12 @@ SPDX-License-Identifier: AGPL-3.0 %>
   <div>
     <table id="trash-index" class="topalign table table-condensed table-fixedlayout">
       <colgroup>
   <div>
     <table id="trash-index" class="topalign table table-condensed table-fixedlayout">
       <colgroup>

-        <col width="5%" />
+        <col width="2%" />

         <col width="20%" />
         <col width="15%" />
         <col width="20%" />
         <col width="15%" />

-        <col width="15%" />
-        <col width="10%" />
-        <col width="30%" />
+        <col width="13%" />
+        <col width="20%" />
+        <col width="25%" />

         <col width="5%" />
       </colgroup>
 
         <col width="5%" />
       </colgroup>
 


@@ -42,9 +42,9 @@ SPDX-License-Identifier: AGPL-3.0 %>
         <tr class="contain-align-left">
           <th></th>
           <th>Name</th>
         <tr class="contain-align-left">
           <th></th>
           <th>Name</th>

-          <th>Trashed at</th>
-          <th title="After this time, no longer available to be recovered from Trash">Permanently<br/>Deleted At</th>
+          <th>Date&nbsp;trashed&nbsp;/<br />to&nbsp;be&nbsp;deleted</th>

           <th>Owner</th>
           <th>Owner</th>

+          <th>UUID&nbsp;/<br />portable data hash</th>

           <th>Contents</th>
           <th></th>
         </tr>
           <th>Contents</th>
           <th></th>
         </tr>

diff --git a/apps/workbench/app/views/trash_items/_show_trash_rows.html.erb b/apps/workbench/app/views/trash_items/_show_trash_rows.html.erb
index aba37656480a290afe403b5af35e4562f055b366..c31beceeeb002e0865ab45171c94cfdee91f15e7 100644 (file)
--- a/apps/workbench/app/views/trash_items/_show_trash_rows.html.erb
+++ b/apps/workbench/app/views/trash_items/_show_trash_rows.html.erb
@@ -13,13 +13,19 @@ SPDX-License-Identifier: AGPL-3.0 %>
         <%= if !obj.name.blank? then obj.name else obj.uuid end %>
       </td>
       <td>
         <%= if !obj.name.blank? then obj.name else obj.uuid end %>
       </td>
       <td>

-        <%= render_localized_date(obj.trash_at) if obj.trash_at %>
+        <% if obj.trash_at %>
+          trash: <%= render_localized_date(obj.trash_at)  %>
+          <br />
+        <% end %>
+        <% if obj.delete_at %>
+          delete: <%= render_localized_date(obj.delete_at) %>
+        <% end %>

       </td>
       <td>
       </td>
       <td>

-        <%= render_localized_date(obj.delete_at) if obj.delete_at %>
+        <%= link_to_if_arvados_object obj.owner_uuid, friendly_name: true %>

       </td>
       <td>
       </td>
       <td>

-        <%= link_to_if_arvados_object obj.owner_uuid, friendly_name: true %>
+        <%= obj.uuid %><br /><%= obj.portable_data_hash %>

       </td>
       <td>
         <% for i in (0..[2, obj.files.length-1].min) %>
       </td>
       <td>
         <% for i in (0..[2, obj.files.length-1].min) %>