From: radhika <radhika@curoverse.com>
Date: Fri, 5 Sep 2014 20:00:24 +0000 (-0400)
Subject: 3654: combine options is enabled when only data collections are selected in project... 
X-Git-Tag: 1.1.0~2212^2~17
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/852573d60776116bed4e86431667abf8c77d3f9a

3654: combine options is enabled when only data collections are selected in project view.
---

diff --git a/apps/workbench/app/views/collections/_show_files.html.erb b/apps/workbench/app/views/collections/_show_files.html.erb
index dc43fe2527..8dbc9ba138 100644
--- a/apps/workbench/app/views/collections/_show_files.html.erb
+++ b/apps/workbench/app/views/collections/_show_files.html.erb
@@ -7,7 +7,7 @@
           <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-selection-action' => 'combine-collections',
                   'data-remote' => true,
                   'data-toggle' => 'dropdown'
             %></li>
diff --git a/apps/workbench/app/views/collections/_show_recent.html.erb b/apps/workbench/app/views/collections/_show_recent.html.erb
index 84f37d74f2..221e0aa779 100644
--- a/apps/workbench/app/views/collections/_show_recent.html.erb
+++ b/apps/workbench/app/views/collections/_show_recent.html.erb
@@ -7,7 +7,7 @@
           <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-selection-action' => 'combine-collections',
                   'data-remote' => true,
                   'data-toggle' => 'dropdown'
             %></li>