11789: Merge branch 'master' into 11789-arvput-exclude-flag

[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 7e01e3d0fe8798b8d486cdd2bd2bfe754a611bd4..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,25 +1,32 @@
-<% @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>
-        <%= check_box_tag 'uuids[]', obj.uuid, false, :class => 'persistent-selection' %>
+        <% if obj.editable? %>
+          <%= 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>
+        <%= render_localized_date(obj.delete_at) if obj.delete_at %>
+      </td>
       <td>
-        <%= obj.trash_at.to_s if obj.trash_at %>
+        <%= link_to_if_arvados_object obj.owner_uuid, friendly_name: true %>
       </td>
       <td>
-        <% i = 0 %>
-        <% while i < 5 and i < obj.files.length %>
+        <% for i in (0..[2, obj.files.length-1].min) %>
           <% file = obj.files[i] %>
           <% file_path = "#{file[0]}/#{file[1]}" %>
           <%= file_path %><br />
-          <% i += 1 %>
         <% end %>
-        <% if i < obj.files.length %>
-          &hellip;
+        <% if obj.files.length > 3 %>
+          <%= "(#{obj.files.length-3} more files)" %>
         <% end %>
       </td>
       <td>