9587: Show "delete_at" timestamp instead of "created_at" timestamp in trash page

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 4d9be07dea3814fc2dc1d86114ded31eb544b4d5..14c5409e7b8ba5579ca94bfa3e673ac07add5dbf 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
@@ -39,7 +39,7 @@
           <th></th>
           <th>Name</th>
           <th>Trashed at</th>
-          <th>Created at</th>
+          <th title="After this time, no longer available to be recovered from Trash">Permanently<br/>Deleted At</th>
           <th>Owner</th>
           <th>Contents</th>
           <th></th>

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 4cc16f6202004dc157c69b2fc9c58a1a62e5234d..747f185573e84c8ae4e083441610c7cbe4951a47 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
@@ -2,7 +2,7 @@
     <tr data-object-uuid="<%= obj.uuid %>" data-kind="<%= obj.kind %>" >
       <td>
         <% if obj.editable? %>
-          <%= check_box_tag 'uuids[]', obj.uuid, false, :class => 'persistent-selection' %>
+          <%= check_box_tag 'uuids[]', obj.uuid, false, :class => 'persistent-selection', style: 'cursor: pointer;' %>
         <% end %>
       </td>
       <td>
@@ -10,7 +10,7 @@
       <td>
         <%= render_localized_date(obj.trash_at) if obj.trash_at %>
       <td>
-        <%= render_localized_date(obj.created_at) if obj.created_at %>
+        <%= render_localized_date(obj.delete_at) if obj.delete_at %>
       </td>
       <td>
         <%= link_to_if_arvados_object obj.owner_uuid, friendly_name: true %>

diff --git a/apps/workbench/app/views/trash_items/_untrash_item.html.erb b/apps/workbench/app/views/trash_items/_untrash_item.html.erb
index 8732531747ace263811412bf35381e72e97cb9c8..74255c3f0fe63cd384bb34868268ef56088d0973 100644 (file)
--- a/apps/workbench/app/views/trash_items/_untrash_item.html.erb
+++ b/apps/workbench/app/views/trash_items/_untrash_item.html.erb
@@ -1,7 +1,7 @@
 <% if object.editable? %>
   <% msg = "Untrash '" + if !object.name.blank? then object.name else object.uuid end + "'?" %>
   <%= link_to({action: 'untrash_items', selection: [object.uuid]}, remote: true, method: :post,
-      title: "Untrash", data: {confirm: msg}) do %>
+      title: "Untrash", style: 'cursor: pointer;') do %>
     <i class="fa fa-fw fa-recycle"></i>
   <% end %>
 <% end %>

diff --git a/apps/workbench/test/integration/trash_test.rb b/apps/workbench/test/integration/trash_test.rb
index 6cac1beb2cfa93b6cd263218e1a550cd56c5a21c..cd2fa390204b0112f3ca485c86dd88c32776116e 100644 (file)
--- a/apps/workbench/test/integration/trash_test.rb
+++ b/apps/workbench/test/integration/trash_test.rb
@@ -42,7 +42,6 @@ class TrashTest < ActionDispatch::IntegrationTest
     # Un-trash another item using the recycle button
     within('tr', text: expired1['name']) do
       first('.fa-recycle').click
-      accept_alert
     end
 
     wait_for_ajax