[ARVADOS] updated: 51549f93489f5d57f71b7767528ee7dec9079fb6

[Git user]

Summary of changes:
 apps/workbench/app/controllers/trash_items_controller.rb              | 4 ++++
 .../app/views/trash_items/_create_new_object_button.html.erb          | 1 +
 .../trash_items/{_show_trash_items.html.erb => _show_recent.html.erb} | 0
 apps/workbench/app/views/trash_items/index.html.erb                   | 2 +-
 4 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 apps/workbench/app/views/trash_items/_create_new_object_button.html.erb
 rename apps/workbench/app/views/trash_items/{_show_trash_items.html.erb => _show_recent.html.erb} (100%)

       via  51549f93489f5d57f71b7767528ee7dec9079fb6 (commit)
      from  5f8a7ee855778644abf70e7058317891738d2ce1 (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 51549f93489f5d57f71b7767528ee7dec9079fb6
Author: radhika <radhika at curoverse.com>
Date:   Fri Jun 2 17:45:06 2017 -0400

    9587: show trash page contents in Recent tab pane

diff --git a/apps/workbench/app/controllers/trash_items_controller.rb b/apps/workbench/app/controllers/trash_items_controller.rb
index db3457c..31581bb 100644
--- a/apps/workbench/app/controllers/trash_items_controller.rb
+++ b/apps/workbench/app/controllers/trash_items_controller.rb
@@ -3,6 +3,10 @@ class TrashItemsController < ApplicationController
     Collection
   end
 
+  def show_pane_list
+    %w(Recent)
+  end
+
   def find_objects_for_index
     # If it's not the index rows partial display, just return
     # The /index request will again be invoked to display the
diff --git a/apps/workbench/app/views/trash_items/_create_new_object_button.html.erb b/apps/workbench/app/views/trash_items/_create_new_object_button.html.erb
new file mode 100644
index 0000000..2ba9e1a
--- /dev/null
+++ b/apps/workbench/app/views/trash_items/_create_new_object_button.html.erb
@@ -0,0 +1 @@
+<%# There is no such thing %>
diff --git a/apps/workbench/app/views/trash_items/_show_trash_items.html.erb b/apps/workbench/app/views/trash_items/_show_recent.html.erb
similarity index 100%
rename from apps/workbench/app/views/trash_items/_show_trash_items.html.erb
rename to apps/workbench/app/views/trash_items/_show_recent.html.erb
diff --git a/apps/workbench/app/views/trash_items/index.html.erb b/apps/workbench/app/views/trash_items/index.html.erb
index bd55a3f..5f5bc83 100644
--- a/apps/workbench/app/views/trash_items/index.html.erb
+++ b/apps/workbench/app/views/trash_items/index.html.erb
@@ -1 +1 @@
-<%= render partial: 'show_trash_items' %>
+<%= render file: 'application/index.html.erb', locals: local_assigns %>

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


hooks/post-receive
--