[ARVADOS] updated: 1.1.0-69-ge76a00c

[Git user]

Summary of changes:
 apps/workbench/app/views/application/404.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

       via  e76a00ca471102d1e536737073314e0f36cf086a (commit)
      from  6e68c94524cfb19fc0b51591eab7e4a55e485164 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit e76a00ca471102d1e536737073314e0f36cf086a
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Mon Oct 23 08:44:15 2017 -0400

    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 <pamstutz at veritasgenetics.com>

diff --git a/apps/workbench/app/views/application/404.html.erb b/apps/workbench/app/views/application/404.html.erb
index c09e634..283f5d5 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 %>

-----------------------------------------------------------------------


hooks/post-receive
--