From: radhika <radhika@curoverse.com>
Date: Wed, 3 Sep 2014 19:35:53 +0000 (-0400)
Subject: 3654: add "combine selections" option to project#show page.
X-Git-Tag: 1.1.0~2212^2~29
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/33710e325a775d8f52ce89ce365b4a5153a68b18?ds=sidebyside

3654: add "combine selections" option to project#show page.
---

diff --git a/apps/workbench/app/views/projects/_show_tab_contents.html.erb b/apps/workbench/app/views/projects/_show_tab_contents.html.erb
index 6a889182d2..a46f535e92 100644
--- a/apps/workbench/app/views/projects/_show_tab_contents.html.erb
+++ b/apps/workbench/app/views/projects/_show_tab_contents.html.erb
@@ -4,7 +4,14 @@
       <div class="btn-group btn-group-sm">
         <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">Selection... <span class="caret"></span></button>
         <ul class="dropdown-menu" role="menu">
-          <li><%= link_to "Compare selected", '#',
+          <li><%= link_to "Combine selections into a new collection", '/combine_selected',
+                  'data-href' => url_for('/combine_selected'),
+                  'data-selection-param-name' => 'selection[]',
+                  'data-selection-action' => 'combine',
+                  'data-remote' => true,
+                  'data-toggle' => 'dropdown'
+            %></li>
+          <li><%= link_to "Compare selected", 'action',
                   'data-href' => compare_pipeline_instances_path,
                   'data-selection-param-name' => 'uuids[]',
                   'data-selection-action' => 'compare'
diff --git a/apps/workbench/config/routes.rb b/apps/workbench/config/routes.rb
index 8f01a767b3..6236e0c512 100644
--- a/apps/workbench/config/routes.rb
+++ b/apps/workbench/config/routes.rb
@@ -80,6 +80,7 @@ ArvadosWorkbench::Application.routes.draw do
   post 'actions' => 'actions#post'
   get 'actions' => 'actions#show'
   get 'websockets' => 'websocket#index'
+  get 'combine_selected' => 'actions#combine_selected_files_into_collection', :as => :combine_selected
 
   root :to => 'projects#index'