16267: Merge branch 'master' into 16267-change-arvbox-deps

[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..dd451b6eac1af0ed657069836bea1e61eab86025 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,29 +1,47 @@
-<% @objects.sort_by { |obj| obj.created_at }.reverse.each do |obj| %>
-    <tr data-object-uuid="<%= obj.uuid %>" data-kind="<%= obj.kind %>" >
+<%# 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? and obj.is_trashed %>
+        <%= 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>
+    <% if obj.is_trashed %>
       <td>
-        <%= check_box_tag 'uuids[]', obj.uuid, false, :class => 'persistent-selection' %>
+        <%= link_to_if_arvados_object @owners[obj.owner_uuid], friendly_name: true %>
       </td>
+
       <td>
-        <%= if !obj.name.blank? then obj.name else obj.uuid end %>
-      <td>
-        <%= obj.created_at.to_s if obj.created_at %>
-      <td>
-        <%= obj.trash_at.to_s if obj.trash_at %>
-      </td>
-      <td>
-        <% i = 0 %>
-        <% while i < 5 and i < obj.files.length %>
-          <% file = obj.files[i] %>
-          <% file_path = "#{file[0]}/#{file[1]}" %>
-          <%= file_path %><br />
-          <% i += 1 %>
+        <% if obj.trash_at %>
+          <%= render_localized_date(obj.trash_at)  %>
         <% end %>
-        <% if i < obj.files.length %>
-          &hellip;
+        <br />
+        <% if obj.delete_at %>
+          <%= render_localized_date(obj.delete_at) %>
         <% end %>
       </td>
-      <td>
-        <%= render partial: 'untrash_item', locals: {object:obj} %>
+    <% else %>
+      <td colspan="2" class="trash-project-msg">
+        <%= link_to_if_arvados_object @owners[obj.owner_uuid], friendly_name: true %>
+        <br>
+        This item is contained within a trashed project.
       </td>
-    </tr>
+    <% end %>
+    <td>
+      <%= obj.uuid %>
+      <% if defined? obj.portable_data_hash %>
+        <br /><%= obj.portable_data_hash %>
+      <% end %>
+    </td>
+    <td>
+      <%= render partial: 'untrash_item', locals: {object:obj} %>
+    </td>
+  </tr>
+
 <% end %>