[ARVADOS] created: 541d4760c249d6c9d50cc01c0a7f38bcd347a58b

[Git user]

        at  541d4760c249d6c9d50cc01c0a7f38bcd347a58b (commit)


commit 541d4760c249d6c9d50cc01c0a7f38bcd347a58b
Author: Lucas Di Pentima <lucas at curoverse.com>
Date:   Mon May 8 15:19:45 2017 -0300

    9587: Trash tab added to projects controller.

diff --git a/apps/workbench/app/controllers/projects_controller.rb b/apps/workbench/app/controllers/projects_controller.rb
index 2cd668a..0322b52 100644
--- a/apps/workbench/app/controllers/projects_controller.rb
+++ b/apps/workbench/app/controllers/projects_controller.rb
@@ -98,6 +98,7 @@ class ProjectsController < ApplicationController
       } if current_user
     pane_list << { :name => 'Sharing',
                    :count => @share_links.count } if @user_is_manager
+    pane_list << { :name => 'Trash' }
     pane_list << { :name => 'Advanced' }
   end
 
@@ -259,6 +260,7 @@ class ProjectsController < ApplicationController
       end
     else
       @objects = @object.contents(order: @order,
+                                  include_trash: true,
                                   limit: @limit,
                                   filters: @filters,
                                   offset: @offset)
diff --git a/apps/workbench/app/views/projects/_show_trash.html.erb b/apps/workbench/app/views/projects/_show_trash.html.erb
new file mode 100644
index 0000000..61c9151
--- /dev/null
+++ b/apps/workbench/app/views/projects/_show_trash.html.erb
@@ -0,0 +1,5 @@
+<%= render_pane 'tab_contents', to_string: true, locals: {
+    include_trash: "true",
+    filters: [['uuid', 'is_a', "arvados#collection"], ['is_trashed', '=', "true"]],
+    sortable_columns: { 'name' => 'collections.name', 'description' => 'collections.description' }
+    }.merge(local_assigns) %>

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


hooks/post-receive
--