[ARVADOS] updated: 1.1.0-66-ge02c4e1

[Git user]

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

       via  e02c4e1b1ed61d57d86f98b9372813d913d5b375 (commit)
      from  6afdf38337e3278234d03480b64e50beaddcd105 (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 e02c4e1b1ed61d57d86f98b9372813d913d5b375
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Fri Oct 20 10:17:05 2017 -0400

    12125: Don't show checkbox for items located within trashed project.
    
    They can't be untrashed directly.
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/apps/workbench/app/views/trash_items/_show_trash_rows.html.erb b/apps/workbench/app/views/trash_items/_show_trash_rows.html.erb
index 7d7bf7b..dd451b6 100644
--- a/apps/workbench/app/views/trash_items/_show_trash_rows.html.erb
+++ b/apps/workbench/app/views/trash_items/_show_trash_rows.html.erb
@@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0 %>
 <% @objects.each do |obj| %>
   <tr data-object-uuid="<%= obj.uuid %>" data-kind="<%= obj.kind %>" >
     <td>
-      <% if obj.editable? %>
+      <% if obj.editable? and obj.is_trashed %>
         <%= check_box_tag 'uuids[]', obj.uuid, false, :class => 'persistent-selection', style: 'cursor: pointer;' %>
       <% end %>
     </td>

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


hooks/post-receive
--