Merge branch 'master' into 3654-combine-selections

[arvados.git] / apps / workbench / app / assets / javascripts / selection.js

diff --git a/apps/workbench/app/assets/javascripts/selection.js b/apps/workbench/app/assets/javascripts/selection.js
index cf31fd7e0a2b259f6bdd7496aee263b488af97d1..bcc33c46bc1b1b67a355b96361b9b9ff30874697 100644 (file)
--- a/apps/workbench/app/assets/javascripts/selection.js
+++ b/apps/workbench/app/assets/javascripts/selection.js
@@ -213,7 +213,7 @@ function enable_disable_selection_actions() {
         toggleClass('disabled',
                     ($checked.filter('[value*=-j7d0g-]').length > 0) ||
                     ($checked.length < 1));
-    $('[data-selection-action=combine]').
+    $('[data-selection-action=combine-project-contents]').
         closest('li').
         toggleClass('disabled',
                     ($checked.filter('[value*=-4zz18-]').length < 1) ||