Merge branch 'master' into 6087-collection-timing

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

diff --git a/apps/workbench/app/views/projects/_show_jobs_and_pipelines.html.erb b/apps/workbench/app/views/projects/_show_jobs_and_pipelines.html.erb
index f2e027588dbe4df85a823a35cdcc33569ebae324..3637ef43ca8683b98d9dbd472685c95942dd6c6f 100644 (file)
--- a/apps/workbench/app/views/projects/_show_jobs_and_pipelines.html.erb
+++ b/apps/workbench/app/views/projects/_show_jobs_and_pipelines.html.erb
@@ -1,4 +1,5 @@
-<%= render partial: 'show_tab_contents', locals: {
-    filters: [['uuid', 'is_a', ["arvados#job", "arvados#pipelineInstance"]]],
-    tab_name: 'Data_collections'
-    } %>
+<%= render_pane 'tab_contents', to_string: true, locals: {
+        limit: 50,
+           filters: [['uuid', 'is_a', ["arvados#job", "arvados#pipelineInstance"]]],
+           sortable_columns: { 'name' => 'jobs.script, pipeline_instances.name', 'description' => 'jobs.description, pipeline_instances.description' }
+    }.merge(local_assigns) %>