scriptoriumadmin/zotero
1
0
Fork 0
mirror of https://github.com/zotero/zotero.git synced 2026-10-04 02:31:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix item sometimes not added to collection on cross-library drag-drop (#5547)

Browse source 
When drag-dropping items into a collection in another library,
perform the addition to collection in the same transaction
as creating a new item in the target library.

When the librariesCollectionsBox refreshes on the `modify` event
when a newly created group item is linked to the selected item,
it re-loads the data of the linked item via item.loadAllData().
This could happen after the item is added to the collection
but before this change is saved. In that case, item._changed.collections
would be cleared, and when the item is saved, there would be
no changes to collections to save.

Fixes: #5539

Also, cleanup leftover unused logic of restoring linked item
from trash on drop that was removed in 2dd16b44d6
This commit is contained in:
abaevbog 2025-10-06 12:30:01 -07:00 • committed by GitHub
parent 5a96e7c90f
commit fefad8a9e3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 26 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
chrome/content/zotero/collectionTree.jsx
View file

@ -1896,15 +1896,6 @@ var CollectionTree = class CollectionTree extends LibraryTree {
// Check if there's already a copy of this item in the library
var linkedItem = await item.getLinkedItem(targetLibraryID, true);
if (linkedItem) {
// If linked item is in the trash, undelete it and remove it from collections
// (since it shouldn't be restored to previous collections)
if (linkedItem.deleted) {
linkedItem.setCollections();
linkedItem.deleted = false;
await linkedItem.save({
skipSelect: true
});
}
return linkedItem.id;
/*
@ -2298,8 +2289,20 @@ var CollectionTree = class CollectionTree extends LibraryTree {
toMove.push(item.id);
}
}
if (!sameLibrary) {
if (sameLibrary) {
// Add items to target container in the same library.
if (targetCollectionID) {
let ids = newIDs.filter(itemID => Zotero.Items.get(itemID).isTopLevelItem());
await Zotero.DB.executeTransaction(async function () {
let collection = await Zotero.Collections.getAsync(targetCollectionID);
await collection.addItems(ids);
}.bind(this));
}
else if (targetTreeRow.isPublications()) {
await Zotero.Items.addToPublications(newItems, copyOptions);
}
}
else {
let toReconcile = [];
await Zotero.Utilities.Internal.forEachChunkAsync(
@ -2307,6 +2310,7 @@ var CollectionTree = class CollectionTree extends LibraryTree {
100,
function (chunk) {
return Zotero.DB.executeTransaction(async () => {
let copiedItemIDs = [];
for (let item of chunk) {
var id = await this._copyItem({
item,
@ -2318,7 +2322,17 @@ var CollectionTree = class CollectionTree extends LibraryTree {
if (!id) {
continue;
}
newIDs.push(id);
copiedItemIDs.push(id);
}
// Add copied items to target collection
if (targetCollectionID) {
for (let itemID of copiedItemIDs) {
let item = Zotero.Items.get(itemID);
if (item.isTopLevelItem()) {
item.addToCollection(targetCollectionID);
await item.save({ skipSelect: true });
}
}
}
});
}.bind(this)
@ -2360,17 +2374,6 @@ var CollectionTree = class CollectionTree extends LibraryTree {
}
}
// Add items to target collection
if (targetCollectionID) {
let ids = newIDs.filter(itemID => Zotero.Items.get(itemID).isTopLevelItem());
await Zotero.DB.executeTransaction(async function () {
let collection = await Zotero.Collections.getAsync(targetCollectionID);
await collection.addItems(ids);
}.bind(this));
}
else if (targetTreeRow.isPublications()) {
await Zotero.Items.addToPublications(newItems, copyOptions);
}
// If moving, remove items from source collection
if (dropEffect == 'move' && toMove.length) {