Merge branch 'master' into 3654-combine-selections

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

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 2789542de2070fed63cb8661bdb8d86a34d9ba55..3aff23e7443d2d89a8ac341010dc48760333c7b9 100644 (file)
--- a/apps/workbench/app/views/projects/_show_tab_contents.html.erb
+++ b/apps/workbench/app/views/projects/_show_tab_contents.html.erb
@@ -4,11 +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 "Combine selections into a new collection", '/combine_selected',
-                  'data-href' => url_for('/combine_selected?show_project=true'),
+          <li><%= link_to "Combine selected collections into a new collection", '#',
+                  'data-href' => combine_selected_path(
+                    action_data: {selection_param: 'project'}.to_json
+                  ),
+                  'id' => 'combine_selections_button',
                   'data-selection-param-name' => 'selection[]',
-                  'data-selection-action' => 'combine',
-                  'data-remote' => true,
+                  'data-selection-action' => 'combine-project-contents',
+                  'method' => 'post',
                   'data-toggle' => 'dropdown'
             %></li>
           <li><%= link_to "Compare selected", 'action',