Merge branch 'master' into 4232-slow-pipes-n-jobs

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

diff --git a/apps/workbench/app/views/projects/_show_subprojects.html.erb b/apps/workbench/app/views/projects/_show_subprojects.html.erb
index 6e93a4a93ab6c48738809b802582af615c75cf7d..7d65639b691d48eb1db72194f84f4b7b27dffa40 100644 (file)
--- a/apps/workbench/app/views/projects/_show_subprojects.html.erb
+++ b/apps/workbench/app/views/projects/_show_subprojects.html.erb
@@ -1,8 +1,4 @@
-<%
-  filters = [['uuid', 'is_a', "arvados#group"]]
-  @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} %>
+<%= render_pane 'tab_contents', to_string: true, locals: {
+    filters: [['uuid', 'is_a', ["arvados#group"]]],
+       sortable_columns: { 'name' => 'groups.name', 'description' => 'groups.description' }
+    }.merge(local_assigns) %>