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

[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 9b3755fab257840e90ce11bf3f446dab10f9624e..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_pane 'tab_contents', to_string: true, locals: {
-    limit: 50,
-    filters: [['uuid', 'is_a', ["arvados#job", "arvados#pipelineInstance"]]]
+        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) %>