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

Fix json[c.field] is undefined sync error

Browse source 
Fix error if local note or attachment is added to a parent item while
the remote version was added to a collection. Now, the new local parent
item will be added to any collections the remote child item was added
to.

Fixes #2934
This commit is contained in:
Dan Stillman 2025-01-09 02:48:27 -05:00
parent d0debc0bed
commit ddb1daabbc
2 changed files with 61 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
chrome/content/zotero/xpcom/sync/syncLocal.js
View file

@ -933,6 +933,22 @@ Zotero.Sync.Data.Local = {
['mtime', 'md5', 'dateAdded', 'dateModified']
);
// If local object became a child item and remote was added to any
// collections, we need to remove the 'collections' changes and add
// the parent item to those collections instead
if (objectType == 'item'
&& !obj.isTopLevelItem()
&& (obj.isNote() || obj.isAttachment())) {
let collections = result.changes
.filter(x => x.field == 'collections' && x.op == 'member-add')
.map(x => x.value);
if (collections.length) {
result.changes = result.changes
.filter(x => !(x.field == 'collections' && x.op == 'member-add'));
saveOptions.newParentItemCollections = collections;
}
}
// If no changes, just update local version number and mark as synced
if (!result.changes.length && !result.conflicts.length) {
Zotero.debug("No remote changes to apply to local "
@ -1542,6 +1558,24 @@ Zotero.Sync.Data.Local = {
Zotero.Libraries.get(obj.libraryID).storageDownloadNeeded = true;
}
}
// See explanation in processObjectsFromJSON()
if (options.newParentItemCollections) {
let parentItem = obj.parentItem;
for (let c of options.newParentItemCollections) {
parentItem.addToCollection(c);
}
yield parentItem.save({
skipEditCheck: true,
skipDateModifiedUpdate: true,
skipSelect: true,
notifierQueue: options.notifierQueue,
// Errors are logged elsewhere, so skip in DataObject.save()
errorHandler: function (e) {
return;
}
});
}
}
catch (e) {
// For now, allow sync to proceed after all errors

27
test/tests/syncLocalTest.js
View file

@ -718,6 +718,33 @@ describe("Zotero.Sync.Data.Local", function() {
}
});
it("should handle local item becoming child and remote being added to a collection", async function () {
var libraryID = Zotero.Libraries.userLibraryID;
var collection = await createDataObject('collection');
var parentItem = await createDataObject('item');
var childItem = await createDataObject('item', { itemType: 'note' });
var data = childItem.toJSON();
await Zotero.Sync.Data.Local.saveCacheObjects('item', libraryID, [data]);
// Add to parent locally
childItem.parentID = parentItem.id;
await childItem.saveTx();
// Add to collection remotely
data.collections = [collection.key];
var json = {
key: childItem.key,
version: 10,
data
};
await Zotero.Sync.Data.Local.processObjectsFromJSON(
'item', libraryID, [json], { stopOnError: true }
);
assert.isTrue(collection.hasItem(parentItem));
});
it("should automatically resolve collection name conflict", async function () {
var libraryID = Zotero.Libraries.userLibraryID;