projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
12197: Update PDH column label for consistency.
[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 0d433bf2044290d6e40ef15a7097a412d141ca35..a7e53e28bd4940d8884fbd81fa477680212d95b9 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,31
@@
-<% @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? %>
<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 %>
<% end %>
</td>
<td>
<%= if !obj.name.blank? then obj.name else obj.uuid end %>
+ </td>
+ <td>
+ <% if obj.trash_at %>
+ <%= render_localized_date(obj.trash_at) %>
+ <% end %>
+ <br />
+ <% if obj.delete_at %>
+ <%= render_localized_date(obj.delete_at) %>
+ <% end %>
+ </td>
<td>
<td>
- <%= obj.created_at.to_s if obj.created_at %>
+ <%= link_to_if_arvados_object obj.owner_uuid, friendly_name: true %>
+ </td>
<td>
<td>
- <%= obj.
trash_at.to_s if obj.trash_at
%>
+ <%= obj.
uuid %><br /><%= obj.portable_data_hash
%>
</td>
<td>
<% for i in (0..[2, obj.files.length-1].min) %>
</td>
<td>
<% for i in (0..[2, obj.files.length-1].min) %>
@@
-19,7
+34,7
@@
<%= file_path %><br />
<% end %>
<% if obj.files.length > 3 %>
<%= file_path %><br />
<% end %>
<% if obj.files.length > 3 %>
- ⋮
+ <%= "(#{obj.files.length-3} more files)" %>
<% end %>
</td>
<td>
<% end %>
</td>
<td>