projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
14812: Remove commented debug line
[arvados.git]
/
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 283f5d59fd78a228a662d10f6823a88e85af7bf7..61cbd670050c5d391e7699d3cf8947f04e994502 100644
(file)
--- a/
apps/workbench/app/views/application/404.html.erb
+++ b/
apps/workbench/app/views/application/404.html.erb
@@
-16,20
+16,29
@@
SPDX-License-Identifier: AGPL-3.0 %>
end
%>
end
%>
- <% if check_trash.andand.any? %>
- <h2>Trashed</h2>
-
- <% object = check_trash.first %>
+ <% untrash_object = nil %>
+ <% if check_trash.andand.any? %>
+ <% object = check_trash.first %>
+ <% if object.respond_to?(:is_trashed) && object.is_trashed %>
<% untrash_object = object %>
<% untrash_object = object %>
- <% while !untrash_object.is_trashed %>
- <% owner = Group.where(uuid: untrash_object.owner_uuid).include_trash(true).first %>
- <% if owner.nil? then %>
+ <% else %>
+ <% owner = object %>
+ <% while true %>
+ <% owner = Group.where(uuid: owner.owner_uuid).include_trash(true).first %>
+ <% if owner.nil? %>
<% break %>
<% break %>
- <% else %>
+ <% end %>
+ <% if owner.is_trashed %>
<% untrash_object = owner %>
<% untrash_object = owner %>
+ <% break %>
<% end %>
<% end %>
<% end %>
<% end %>
+ <% end %>
+ <% end %>
+
+ <% if !untrash_object.nil? %>
+ <h2>Trashed</h2>
<% untrash_name = if !untrash_object.name.blank? then
"'#{untrash_object.name}'"
<% untrash_name = if !untrash_object.name.blank? then
"'#{untrash_object.name}'"