X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/656176226eeb75d24c17de792cc090e4862c46f5..fed9f70cdc99a3bc94a54bf1d182b13204a597be:/apps/workbench/app/views/application/404.html.erb

diff --git a/apps/workbench/app/views/application/404.html.erb b/apps/workbench/app/views/application/404.html.erb
index 2d9b5cf2c6..94a6520873 100644
--- a/apps/workbench/app/views/application/404.html.erb
+++ b/apps/workbench/app/views/application/404.html.erb
@@ -16,31 +16,59 @@ SPDX-License-Identifier: AGPL-3.0 %>
    end
 %>
 
+  <% untrash_object = nil %>
+
   <% if check_trash.andand.any? %>
+    <% object = check_trash.first %>
+    <% if object.respond_to?(:is_trashed) && object.is_trashed %>
+      <% untrash_object = object %>
+    <% else %>
+      <% owner = Group.where(uuid: object.owner_uuid).include_trash(true).first %>
+      <% while !owner.nil? && !owner.is_trashed %>
+        <% if !owner.nil? and owner.is_trashed then %>
+          <% untrash_object = owner %>
+          <% break %>
+        <% end %>
+        <% owner = Group.where(uuid: owner.owner_uuid).include_trash(true).first %>
+      <% end %>
+    <% end %>
+  <% end %>
+
+  <% if !untrash_object.nil? %>
     <h2>Trashed</h2>
 
-    <p>The <%= req_item %> is in the trash.
+      <% untrash_name = if !untrash_object.name.blank? then
+                 "'#{untrash_object.name}'"
+                 else
+                 untrash_object.uuid
+               end %>
 
-      <% object = check_trash.first %>
+    <p>The <%= req_item %> is
+      <% if untrash_object == object %>
+        in the trash.
+      <% else %>
+        owned by trashed project <%= untrash_name %> (<code><%= untrash_object.uuid %></code>).
+      <% end %>
+    </p>
 
-      <% if object.is_trashed
-         untrash_object = object
-         else
-       end %>
+    <p>
+      It will be permanently deleted at <%= render_localized_date(untrash_object.delete_at) %>.
+    </p>
 
-        <% if untrash_object.editable? %>
-          <% msg = "Untrash '" + if !untrash_object.name.blank? then untrash_object.name else untrash_object.uuid end + "'?" %>
-          <%= link_to({action: 'untrash_items', selection: [untrash_object.uuid], controller: :trash_items}, remote: true, method: :post,
+  <p>
+    <% if untrash_object != object %>
+      You must untrash the owner project to access this <%= class_name_h %>.
+    <% end %>
+      <% if untrash_object.is_trashed and untrash_object.editable? %>
+        <% msg = "Untrash '#{untrash_name}'?" %>
+        <%= link_to({action: 'untrash_items', selection: [untrash_object.uuid], controller: :trash_items}, remote: true, method: :post,
         title: "Untrash", style: 'cursor: pointer;') do %>
 
-          <% end %>
-
-          <%= form_tag url_for({action: 'untrash_items', controller: :trash_items}), {method: :post} %>
-          <%= hidden_field_tag :selection, [untrash_object.uuid] %>
-          <button type="submit">Click here to untrash this item <i class="fa fa-fw fa-recycle"></i></button>
         <% end %>
-      <% else %>
-        <% %>
+
+        <%= form_tag url_for({action: 'untrash_items', controller: :trash_items}), {method: :post} %>
+        <%= hidden_field_tag :selection, [untrash_object.uuid] %>
+        <button type="submit">Click here to untrash <%= untrash_name %> <i class="fa fa-fw fa-recycle"></i></button>
       <% end %>
     </p>