[ARVADOS] updated: 0923fecbf907d2aaa7f35775eba9ecd947eed098

[Git user]

Summary of changes:
 .../app/views/trash_items/_show_recent_trash.html.erb       |  2 +-
 .../app/views/trash_items/_show_trash_rows.html.erb         |  6 +++---
 apps/workbench/test/integration/trash_test.rb               | 13 ++++++++++++-
 3 files changed, 16 insertions(+), 5 deletions(-)

       via  0923fecbf907d2aaa7f35775eba9ecd947eed098 (commit)
       via  36c50d4695f05ac40109ed6e8358291081c5b9f7 (commit)
      from  6ac4615d13060a19d8cafbe35b67838e8ead33b0 (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 0923fecbf907d2aaa7f35775eba9ecd947eed098
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Sun Sep 17 23:03:29 2017 -0400

    12197: Test PDH search and display on trash page.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/apps/workbench/test/integration/trash_test.rb b/apps/workbench/test/integration/trash_test.rb
index a8c2699..5c6987e 100644
--- a/apps/workbench/test/integration/trash_test.rb
+++ b/apps/workbench/test/integration/trash_test.rb
@@ -18,6 +18,8 @@ class TrashTest < ActionDispatch::IntegrationTest
     visit page_with_token('active', "/trash")
 
     assert_text deleted['name']
+    assert_text deleted['uuid']
+    assert_text deleted['portable_data_hash']
     assert_text expired1['name']
     assert_no_text expired2['name']   # not readable by this user
     assert_no_text 'foo_file'         # not trash
@@ -60,12 +62,21 @@ class TrashTest < ActionDispatch::IntegrationTest
     visit page_with_token('active', "/trash")
 
     assert_text deleted['name']
+    assert_text deleted['uuid']
+    assert_text deleted['portable_data_hash']
     assert_text expired['name']
 
     page.find_field('Search trash').set 'expired'
 
-    assert_text expired['name']
     assert_no_text deleted['name']
+    assert_text expired['name']
+
+    page.find_field('Search trash').set deleted['portable_data_hash'][0..9]
+
+    assert_no_text expired['name']
+    assert_text deleted['name']
+    assert_text deleted['uuid']
+    assert_text deleted['portable_data_hash']
 
     click_button 'Selection...'
     within('.selection-action-container') do

commit 36c50d4695f05ac40109ed6e8358291081c5b9f7
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Thu Sep 14 11:31:05 2017 -0400

    12197: Remove trash/delete labels on content rows.
    
    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 d5b23e0..3cdb23e 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
@@ -31,8 +31,8 @@ SPDX-License-Identifier: AGPL-3.0 %>
       <colgroup>
         <col width="2%" />
         <col width="20%" />
-        <col width="15%" />
         <col width="13%" />
+        <col width="15%" />
         <col width="20%" />
         <col width="25%" />
         <col width="5%" />
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 c31bece..a7e53e2 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
@@ -14,11 +14,11 @@ SPDX-License-Identifier: AGPL-3.0 %>
       </td>
       <td>
         <% if obj.trash_at %>
-          trash: <%= render_localized_date(obj.trash_at)  %>
-          <br />
+          <%= render_localized_date(obj.trash_at)  %>
         <% end %>
+        <br />
         <% if obj.delete_at %>
-          delete: <%= render_localized_date(obj.delete_at) %>
+          <%= render_localized_date(obj.delete_at) %>
         <% end %>
       </td>
       <td>

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


hooks/post-receive
--