3499: Merge branch 'master' into 3499-home-project

[arvados.git] / apps / workbench / app / views / projects / _show_data_collections.html.erb

diff --git a/apps/workbench/app/views/projects/_show_data_collections.html.erb b/apps/workbench/app/views/projects/_show_data_collections.html.erb
index a8b58b84481ca92ac2d77e18c1a83e2b2b7edcb4..3c8607ef40c5819d851ba1840d142ead72518e0e 100644 (file)
--- a/apps/workbench/app/views/projects/_show_data_collections.html.erb
+++ b/apps/workbench/app/views/projects/_show_data_collections.html.erb
@@ -1,3 +1,4 @@
+<% if @object.uuid != current_user.uuid # Not the "Home" project %>
 <% content_for :content_top do %>
 
 <h2>
@@ -8,6 +9,7 @@
   <%= render_editable_attribute @object, 'description', nil, { 'data-emptytext' => "(No description provided)", 'data-toggle' => 'manual' } %>
 </div>
 
+<% end %>
 <% end %>
 
 <% content_for :tab_line_buttons do %>
@@ -41,6 +43,7 @@
        choose_projects_path(
         title: 'Move this project to...',
         editable: true,
+        my_root_selectable: true,
         action_name: 'Move',
         action_href: project_path(@object.uuid),
         action_method: 'put',
@@ -54,4 +57,11 @@
   <% end %>
 <% end %>
 
-<%= render partial: 'show_tab_contents', locals: {project: @object, objects_and_names: @objects_and_names, data_kind: ['arvados#collection']} %>
+<% 
+  filters = [['uuid', 'is_a', "arvados#collection"]]
+  @objects = @object.contents({limit: 50, include_linked: true, :filters => filters})
+  objects_and_names = get_objects_and_names @objects
+  page_offset = next_page_offset @objects
+%>
+
+<%= render partial: 'show_tab_contents', locals: {project: @object, objects_and_names: objects_and_names, filters: filters, page_offset: page_offset, tab_name: 'Data_collections'} %>