2872: Fix bugs, tweak formatting

[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 84d65cda2d84419c20d5bf6b00a96773aaae9680..a313c8b78e17da310ce011745b59599ef92c51d4 100644 (file)
--- a/apps/workbench/app/assets/javascripts/selection.js
+++ b/apps/workbench/app/assets/javascripts/selection.js
@@ -57,8 +57,10 @@ jQuery(function($){
         $("#persistent-selection-count").text(lst.length);
         if (lst.length > 0) {
             html = '<li><a href="#" class="btn btn-xs btn-info" id="clear_selections_button"><i class="fa fa-fw fa-ban"></i> Clear selections</a></li>';
-            if (this_object_uuid.match('-j7d0g-'))
-                html += '<li><button class="btn btn-xs btn-info" type="submit" name="copy_selections_into_project" id="copy_selections_into_project"><i class="fa fa-fw fa-folder-open"></i> Copy selections into this project</button></li>';
+            if (this_object_uuid.match('-j7d0g-')) {
+                html += '<li><button class="btn btn-xs btn-info" type="submit" name="copy_selections_into_project" id="copy_selections_into_project"><i class="fa fa-fw fa-copy"></i> Copy selections into this project</button></li>';
+                html += '<li><button class="btn btn-xs btn-info" type="submit" name="move_selections_into_project" id="move_selections_into_project"><i class="fa fa-fw fa-truck"></i> Move selections into this project</button></li>';
+           }
             html += '<li><button class="btn btn-xs btn-info" type="submit" name="combine_selected_files_into_collection" '
                 + ' id="combine_selected_files_into_collection">'
                 + '<i class="fa fa-fw fa-archive"></i> Combine selected collections and files into a new collection</button></li>'
@@ -184,6 +186,9 @@ function dispatch_selection_action() {
     var data = [];
     var param_name = $(this).attr('data-selection-param-name');
     var href = $(this).attr('data-href');
+    if ($(this).closest('.disabled').length > 0) {
+       return false;
+    }
     $('.persistent-selection:checkbox:checked').each(function() {
         data.push({name: param_name, value: $(this).val()});
     });
@@ -200,8 +205,8 @@ function enable_disable_selection_actions() {
     var $checked = $('.persistent-selection:checkbox:checked');
     $('[data-selection-action]').
         closest('div.btn-group-sm').
-        find('*').
-        prop('disabled', ($checked.length == 0));
+        find('ul li').
+        toggleClass('disabled', ($checked.length == 0));
     $('[data-selection-action=compare]').
         closest('li').
         toggleClass('disabled',