projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
37b7652
)
3618: best guesses about which database columns could be used for sorting (not certai...
author
Phil Hodgson <bitbucket@philhodgson.net>
Sun, 26 Oct 2014 12:25:02 +0000
(13:25 +0100)
committer
Phil Hodgson <bitbucket@philhodgson.net>
Sun, 26 Oct 2014 12:25:02 +0000
(13:25 +0100)
apps/workbench/app/views/projects/_show_data_collections.html.erb
patch
|
blob
|
history
apps/workbench/app/views/projects/_show_jobs_and_pipelines.html.erb
patch
|
blob
|
history
apps/workbench/app/views/projects/_show_other_objects.html.erb
patch
|
blob
|
history
apps/workbench/app/views/projects/_show_pipeline_templates.html.erb
patch
|
blob
|
history
apps/workbench/app/views/projects/_show_subprojects.html.erb
patch
|
blob
|
history
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 1bf8b459fa23c6fcbf9ce62c5749048abf733d9b..991e9b142891ef8ecb6140780ed0ad6493890630 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,4
+1,4
@@
<%= render_pane 'tab_contents', to_string: true, locals: {
filters: [['uuid', 'is_a', "arvados#collection"]],
<%= 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) %>
}.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 9f6e5238354674a1c99b1a75b63800d15e4915c1..230e111f9f459f98e7c9a601a7d7bf2bf2e2bd64 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,4
@@
<%= render_pane 'tab_contents', to_string: true, locals: {
filters: [['uuid', 'is_a', ["arvados#job", "arvados#pipelineInstance"]]],
<%= 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) %>
}.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 af6fbd1a92ab9b5049e64d635741f4295e7a46a5..114ee5bedc4c4b98f79f9f221224eb5646f0f3d7 100644
(file)
--- 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: {
<%= 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) %>
}.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 b875b086ec3e1528a1a29fb35df40ba1b239dd7c..402ce26f5911e59243bab999916fac11be29d008 100644
(file)
--- 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: {
<%= 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) %>
}.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 2c0ba6017831b5cab5c2361a98aa5a49ed9f1e1a..7d65639b691d48eb1db72194f84f4b7b27dffa40 100644
(file)
--- 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: {
<%= 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) %>
}.merge(local_assigns) %>