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

Fix copying of standalone attachments between libraries

Browse source 
Regression in f684984b07 (maybe a race condition)
This commit is contained in:
Dan Stillman 2022-08-13 02:00:24 -04:00
parent 30197a09d2
commit 344a10421a
2 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1615,7 +1615,7 @@ var CollectionTree = class CollectionTree extends LibraryTree {
return false;
}
let newAttachment = Zotero.Attachments.copyAttachmentToLibrary(item, targetLibraryID);
let newAttachment = await Zotero.Attachments.copyAttachmentToLibrary(item, targetLibraryID);
if (options.annotations) {
await Zotero.Items.copyChildItems(item, newAttachment);
}

18
test/tests/collectionTreeTest.js
View file

@ -891,6 +891,24 @@ describe("Zotero.CollectionTree", function() {
return group.eraseTx();
});
it("should copy a standalone attachment to a group", async function () {
await Zotero.Users.setCurrentUserID(1);
await Zotero.Users.setName(1, 'Name 1');
await Zotero.Users.setName(12345, 'Name 2');
var group = await createGroup();
var item = await importPDFAttachment();
var ids = (await onDrop('item', 'L' + group.libraryID, [item.id])).ids;
var newItem = Zotero.Items.get(ids[0]);
assert.equal(newItem.libraryID, group.libraryID);
assert.isTrue(newItem.isPDFAttachment());
return group.eraseTx();
});
it("should not copy an item or its attachment to a group twice", function* () {
var group = yield getGroup();