[ARVADOS] created: 6ac4615d13060a19d8cafbe35b67838e8ead33b0

[Git user]

        at  6ac4615d13060a19d8cafbe35b67838e8ead33b0 (commit)


commit 6ac4615d13060a19d8cafbe35b67838e8ead33b0
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Wed Sep 13 16:37:46 2017 -0400

    12197: Show UUID and PDH of trashed collections.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at 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 a78b02f..d5b23e0 100644
--- 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>
-        <col width="5%" />
+        <col width="2%" />
         <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>
 
@@ -42,9 +42,9 @@ SPDX-License-Identifier: AGPL-3.0 %>
         <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 trashed /<br />to be deleted</th>
           <th>Owner</th>
+          <th>UUID /<br />portable data hash</th>
           <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 aba3765..c31bece 100644
--- 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>
-        <%= 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>
-        <%= render_localized_date(obj.delete_at) if obj.delete_at %>
+        <%= link_to_if_arvados_object obj.owner_uuid, friendly_name: true %>
       </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) %>

commit 777466ea9bfebd7d1be2ce9d90515244f9f1a7fb
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Wed Sep 13 16:03:07 2017 -0400

    12197: Add missing end tags.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

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 6fc1676..aba3765 100644
--- a/apps/workbench/app/views/trash_items/_show_trash_rows.html.erb
+++ b/apps/workbench/app/views/trash_items/_show_trash_rows.html.erb
@@ -11,8 +11,10 @@ SPDX-License-Identifier: AGPL-3.0 %>
       </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 %>
+      </td>
       <td>
         <%= render_localized_date(obj.delete_at) if obj.delete_at %>
       </td>

commit a68773416fa1bb1a6724f6e5b020b3a900eecd26
Merge: 7ed59a3 81d4874
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Wed Sep 13 15:37:09 2017 -0400

    Merge branch '12194-search-always-valid'
    
    refs #12194
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>


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


hooks/post-receive
--