From 829c8fee68b46c6654aab967b51288fcd87ed482 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Fri, 5 Aug 2016 16:15:25 -0400
Subject: [PATCH] (js) Don't block when copying/moving vLists

---
 .../js/Contacts/AddressBooksController.js     | 61 ++++++++++---------
 1 file changed, 31 insertions(+), 30 deletions(-)

diff --git a/UI/WebServerResources/js/Contacts/AddressBooksController.js b/UI/WebServerResources/js/Contacts/AddressBooksController.js
index 044c5de6c..2e1505eec 100644
--- a/UI/WebServerResources/js/Contacts/AddressBooksController.js
+++ b/UI/WebServerResources/js/Contacts/AddressBooksController.js
@@ -312,47 +312,48 @@
      * @see AddressBookController._selectedCardsOperation
      */
     function dragSelectedCards(srcFolder, dstFolder, mode) {
-      var dstId, cards, ids, clearCardView, promise, success;
+      var dstId, allCards, cards, ids, clearCardView, promise, success;
 
       dstId = dstFolder.id;
       clearCardView = false;
-      cards = srcFolder.$selectedCards();
-      if (cards.length === 0)
-        cards = [srcFolder.$selectedCard()];
+      allCards = srcFolder.$selectedCards();
+      if (allCards.length === 0)
+        allCards = [srcFolder.$selectedCard()];
+      cards = _.filter(allCards, function(card) {
+        return card.$isCard();
+      });
 
-      if (_.find(cards, function(card) {
-        return card.$isList();
-      })) {
+      if (cards.length != allCards.length)
         $mdToast.show(
           $mdToast.simple()
             .content(l("Lists can't be moved or copied."))
             .position('top right')
             .hideDelay(2000));
-        return;
-      }
 
-      if (mode == 'copy') {
-        promise = srcFolder.$copyCards(cards, dstId);
-        success = l('%{0} card(s) copied', cards.length);
-      }
-      else {
-        promise = srcFolder.$moveCards(cards, dstId);
-        success = l('%{0} card(s) moved', cards.length);
-        // Check if currently displayed card will be moved
-        ids = _.map(cards, 'id');
-        clearCardView = (srcFolder.selectedCard && ids.indexOf(srcFolder.selectedCard) >= 0);
-      }
+      if (cards.length) {
+        if (mode == 'copy') {
+          promise = srcFolder.$copyCards(cards, dstId);
+          success = l('%{0} card(s) copied', cards.length);
+        }
+        else {
+          promise = srcFolder.$moveCards(cards, dstId);
+          success = l('%{0} card(s) moved', cards.length);
+          // Check if currently displayed card will be moved
+          ids = _.map(cards, 'id');
+          clearCardView = (srcFolder.selectedCard && ids.indexOf(srcFolder.selectedCard) >= 0);
+        }
 
-      // Show success toast when action succeeds
-      promise.then(function() {
-        if (clearCardView)
-          $state.go('app.addressbook');
-        $mdToast.show(
-          $mdToast.simple()
-            .content(success)
-            .position('top right')
-            .hideDelay(2000));
-      });
+        // Show success toast when action succeeds
+        promise.then(function() {
+          if (clearCardView)
+            $state.go('app.addressbook');
+          $mdToast.show(
+            $mdToast.simple()
+              .content(success)
+              .position('top right')
+              .hideDelay(2000));
+        });
+      }
     }
 
   }