mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix dragging collections between libraries

Browse source
This commit is contained in:
Dan Stillman 2017-03-04 04:17:25 -05:00
parent 1b81004a93
commit 704e8ffeea
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
chrome/content/zotero/xpcom/collectionTreeView.js
View file

@ -1811,11 +1811,11 @@ 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 col.getLinkedCollection(treeRow.ref.libraryID)) {
if (yield draggedCollection.getLinkedCollection(treeRow.ref.libraryID)) {
return false;
}
var descendents = col.getDescendents(false, 'collection');
let descendents = draggedCollection.getDescendents(false, 'collection');
for (let descendent of descendents) {
descendent = Zotero.Collections.get(descendent.id);
// Disallow if linked collection already exists for any subcollections
@ -2023,14 +2023,14 @@ Zotero.CollectionTreeView.prototype.drop = Zotero.Promise.coroutine(function* (r
var newCollection = new Zotero.Collection;
newCollection.libraryID = targetLibraryID;
yield c.clone(false, newCollection);
c.clone(false, newCollection);
if (parentID) {
newCollection.parentID = parentID;
}
var collectionID = yield newCollection.save();
// Record link
c.addLinkedCollection(newCollection);
yield c.addLinkedCollection(newCollection);
// Recursively copy subcollections
if (desc.children.length) {

2
chrome/content/zotero/xpcom/uri.js
View file

@ -173,7 +173,7 @@ Zotero.URI = new function () {
* Return URI of collection, which might be a local URI if user hasn't synced
*/
this.getCollectionURI = function (collection) {
return this._getObjectURI(item);
return this._getObjectURI(collection);
}