From: Peter Amstutz Date: Mon, 23 Oct 2017 12:44:15 +0000 (-0400) Subject: 12125: Don't offer to untrash item if it isn't trash X-Git-Tag: 1.1.1~30^2 X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/e76a00ca471102d1e536737073314e0f36cf086a?hp=6e68c94524cfb19fc0b51591eab7e4a55e485164 12125: Don't offer to untrash item if it isn't trash Ensure that it behaves in a reasonable way if user has access to an item via a sideways permission link instead of the usual ownership hierarchy. Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- diff --git a/apps/workbench/app/views/application/404.html.erb b/apps/workbench/app/views/application/404.html.erb index c09e6349ea..283f5d59fd 100644 --- a/apps/workbench/app/views/application/404.html.erb +++ b/apps/workbench/app/views/application/404.html.erb @@ -53,7 +53,7 @@ SPDX-License-Identifier: AGPL-3.0 %> <% if untrash_object != object %> You must untrash the owner project to access this <%= class_name_h %>. <% end %> - <% if untrash_object.editable? %> + <% 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 %>