Merge branch '12934-cwl-conformance' refs #12934

[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 ee61e45594428e26acd97efa3663e055f3d4e9a0..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
@@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0 %>
 <% @objects.each do |obj| %>
   <tr data-object-uuid="<%= obj.uuid %>" data-kind="<%= obj.kind %>" >
     <td>
-      <% if obj.editable? %>
+      <% if obj.editable? and obj.is_trashed %>
         <%= check_box_tag 'uuids[]', obj.uuid, false, :class => 'persistent-selection', style: 'cursor: pointer;' %>
       <% end %>
     </td>
@@ -30,7 +30,7 @@ SPDX-License-Identifier: AGPL-3.0 %>
       <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.  You must untrash the parent project to recover it.
+        This item is contained within a trashed project.
       </td>
     <% end %>
     <td>
@@ -40,9 +40,7 @@ SPDX-License-Identifier: AGPL-3.0 %>
       <% end %>
     </td>
     <td>
-      <% if obj.is_trashed %>
-        <%= render partial: 'untrash_item', locals: {object:obj} %>
-      <% end %>
+      <%= render partial: 'untrash_item', locals: {object:obj} %>
     </td>
   </tr>