Merge branch '12134-llfuse-patch'

[arvados.git] / apps / workbench / app / views / trash_items / _show_trash_rows.html.erb

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 d617d8d2ea0c4a139daa00f45db6eb2e74387421..6fc1676b85dbcb378d300f5efffb67c2edde98a3 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
@@ -1,16 +1,20 @@
-<% @objects.sort_by { |obj| obj.created_at }.reverse.each do |obj| %>
+<%# Copyright (C) The Arvados Authors. All rights reserved.
+
+SPDX-License-Identifier: AGPL-3.0 %>
+
+<% @objects.each do |obj| %>
     <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>
         <%= if !obj.name.blank? then obj.name else obj.uuid end %>
       <td>
-        <%= obj.created_at.to_s if obj.created_at %>
+        <%= render_localized_date(obj.trash_at) if obj.trash_at %>
       <td>
-        <%= obj.trash_at.to_s if obj.trash_at %>
+        <%= render_localized_date(obj.delete_at) if obj.delete_at %>
       </td>
       <td>
         <%= link_to_if_arvados_object obj.owner_uuid, friendly_name: true %>
@@ -22,7 +26,7 @@
           <%= file_path %><br />
         <% end %>
         <% if obj.files.length > 3 %>
-          &vellip;
+          <%= "(#{obj.files.length-3} more files)" %>
         <% end %>
       </td>
       <td>