12765: Fix untrash button on 404 page.

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>

diff --git a/apps/workbench/app/views/application/404.html.erb b/apps/workbench/app/views/application/404.html.erb
index 94a6520873cc1a0cbc703aed52371a9b3be28ed6..61cbd670050c5d391e7699d3cf8947f04e994502 100644 (file)
--- a/apps/workbench/app/views/application/404.html.erb
+++ b/apps/workbench/app/views/application/404.html.erb
@@ -23,13 +23,16 @@ SPDX-License-Identifier: AGPL-3.0 %>
     <% 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 %>
+      <% owner = object %>
+      <% while true %>
+        <% owner = Group.where(uuid: owner.owner_uuid).include_trash(true).first %>
+        <% if owner.nil? %>
+          <% break %>
+        <% end %>
+        <% if owner.is_trashed %>
           <% untrash_object = owner %>
           <% break %>
         <% end %>
-        <% owner = Group.where(uuid: owner.owner_uuid).include_trash(true).first %>
       <% end %>
     <% end %>
   <% end %>