www

commit c180bce0f0753f0080ab9e6cfe2ce4100b570998
parent d0d7aec4b0306cf846e5fcf59ed9373a1864a2e3
Author: Dan Stillman <dstillman@zotero.org>
Date:   Sat,  4 Mar 2017 16:05:56 -0500

Check linked collections in both directions

Diffstat:
M
chrome/content/zotero/xpcom/collectionTreeView.js
 | 
4
++--

1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/chrome/content/zotero/xpcom/collectionTreeView.js b/chrome/content/zotero/xpcom/collectionTreeView.js
@@ -1811,7 +1811,7 @@ Zotero.CollectionTreeView.prototype.canDropCheckAsync = Zotero.Promise.coroutine
 			// Dragging a collection to a different library
 			if (treeRow.ref.libraryID != draggedCollection.libraryID) {
 				// Disallow if linked collection already exists
-				if (yield draggedCollection.getLinkedCollection(treeRow.ref.libraryID)) {
+				if (yield draggedCollection.getLinkedCollection(treeRow.ref.libraryID, true)) {
 					return false;
 				}
 				
@@ -1822,7 +1822,7 @@ Zotero.CollectionTreeView.prototype.canDropCheckAsync = Zotero.Promise.coroutine
 					//
 					// If this is allowed in the future for the root collection,
 					// need to allow drag only to root
-					if (yield descendent.getLinkedCollection(treeRow.ref.libraryID)) {
+					if (yield descendent.getLinkedCollection(treeRow.ref.libraryID, true)) {
 						return false;
 					}
 				}