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

diff --git a/apps/workbench/app/views/collections/_show_files.html.erb b/apps/workbench/app/views/collections/_show_files.html.erb
index dc43fe2527bf458c1439da4b0497f78d14264165..8dbc9ba138c86e8f182cd3b719492c53dde71b1c 100644 (file)
--- 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 84f37d74f27698fadd585878c5cda316721209d2..221e0aa7797de568cf6887b2e95acdb81005c7d1 100644 (file)
--- 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>