From: Phil Hodgson <bitbucket@philhodgson.net>
Date: Sun, 26 Oct 2014 12:25:02 +0000 (+0100)
Subject: 3618: best guesses about which database columns could be used for sorting (not certai... 
X-Git-Tag: 1.1.0~2039^2~12
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/6bfa13079feb0cd6632dcf83dd6e1dc1d99d8cdf

3618: best guesses about which database columns could be used for sorting (not certain about the descriptions, though, in many cases)
---

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 1bf8b459fa..991e9b1428 100644
--- a/apps/workbench/app/views/projects/_show_data_collections.html.erb
+++ b/apps/workbench/app/views/projects/_show_data_collections.html.erb
@@ -1,4 +1,4 @@
 <%= render_pane 'tab_contents', to_string: true, locals: {
     filters: [['uuid', 'is_a', "arvados#collection"]],
-    sortable_columns: { 'name' => 'collections.name' }
+    sortable_columns: { 'name' => 'collections.name', 'description' => 'collections.description' }
     }.merge(local_assigns) %>
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 9f6e523835..230e111f9f 100644
--- 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,4 @@
 <%= render_pane 'tab_contents', to_string: true, locals: {
 	    filters: [['uuid', 'is_a', ["arvados#job", "arvados#pipelineInstance"]]],
-	    sortable_columns: { 'name' => 'jobs.script, pipeline_instances.name' }
+	    sortable_columns: { 'name' => 'jobs.script, pipeline_instances.name', 'description' => 'jobs.description, pipeline_instances.description' }
     }.merge(local_assigns) %>
diff --git a/apps/workbench/app/views/projects/_show_other_objects.html.erb b/apps/workbench/app/views/projects/_show_other_objects.html.erb
index af6fbd1a92..114ee5bedc 100644
--- a/apps/workbench/app/views/projects/_show_other_objects.html.erb
+++ b/apps/workbench/app/views/projects/_show_other_objects.html.erb
@@ -1,3 +1,4 @@
 <%= render_pane 'tab_contents', to_string: true, locals: {
-    filters: [['uuid', 'is_a', ["arvados#human", "arvados#specimen", "arvados#trait"]]]
+    filters: [['uuid', 'is_a', ["arvados#human", "arvados#specimen", "arvados#trait"]]],
+	sortable_columns: { 'name' => 'humans.uuid, specimens.uuid, traits.name' }
     }.merge(local_assigns) %>
diff --git a/apps/workbench/app/views/projects/_show_pipeline_templates.html.erb b/apps/workbench/app/views/projects/_show_pipeline_templates.html.erb
index b875b086ec..402ce26f59 100644
--- a/apps/workbench/app/views/projects/_show_pipeline_templates.html.erb
+++ b/apps/workbench/app/views/projects/_show_pipeline_templates.html.erb
@@ -1,3 +1,4 @@
 <%= render_pane 'tab_contents', to_string: true, locals: {
-    filters: [['uuid', 'is_a', ["arvados#pipelineTemplate"]]]
+    filters: [['uuid', 'is_a', ["arvados#pipelineTemplate"]]],
+	sortable_columns: { 'name' => 'pipeline_templates.name', 'description' => 'pipeline_templates.description' }
     }.merge(local_assigns) %>
diff --git a/apps/workbench/app/views/projects/_show_subprojects.html.erb b/apps/workbench/app/views/projects/_show_subprojects.html.erb
index 2c0ba60178..7d65639b69 100644
--- a/apps/workbench/app/views/projects/_show_subprojects.html.erb
+++ b/apps/workbench/app/views/projects/_show_subprojects.html.erb
@@ -1,3 +1,4 @@
 <%= render_pane 'tab_contents', to_string: true, locals: {
-    filters: [['uuid', 'is_a', ["arvados#group"]]]
+    filters: [['uuid', 'is_a', ["arvados#group"]]],
+	sortable_columns: { 'name' => 'groups.name', 'description' => 'groups.description' }
     }.merge(local_assigns) %>