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 ffa380c26d5e747acd00f6798bd4398f9c9d138d..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,12 +4,22 @@
       <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 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-project-contents',
+                  'method' => 'post',
+                  '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'
             %></li>
-         <li><%= link_to "Copy selected", '#',
+          <li><%= link_to "Copy selected", '#',
                   'data-href' => choose_projects_path(
                     title: 'Copy selected items to...',
                     editable: true,
@@ -18,14 +28,14 @@
                     action_method: 'post',
                     action_data_from_params: ['selection'],
                     action_data: {
-                      move_selections_into_project: true,
+                      copy_selections_into_project: true,
                       selection_param: 'uuid',
                       success: 'page-refresh'}.to_json),
                   'data-remote' => true,
                   'data-selection-param-name' => 'selection[]',
                   'data-selection-action' => 'copy'
             %></li>
-         <li><%= link_to "Move selected", '#',
+          <li><%= link_to "Move selected", '#',
                   'data-href' => choose_projects_path(
                     title: 'Move selected items to...',
                     editable: true,