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

Ensure objects remain editable after undo failures

Browse source
This commit is contained in:
Tom Najdek 2026-06-08 16:32:34 +02:00
parent 01087930b1
commit 39bcb64fc0
No known key found for this signature in database
GPG key ID: EEC61A7B4C667D77
2 changed files with 38 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
chrome/content/zotero/xpcom/data/dataObject.js
View file

@ -987,17 +987,17 @@ Zotero.DataObject.prototype.save = async function (options = {}) {
].forEach(x => env.options[x] = true);
}
var proceed = await this._initSave(env);
if (!proceed) return false;
if (env.isNew) {
Zotero.debug('Saving data for new ' + this._objectType + ' to database', 4);
}
else {
Zotero.debug('Updating database with new ' + this._objectType + ' data', 4);
}
try {
var proceed = await this._initSave(env);
if (!proceed) return false;
if (env.isNew) {
Zotero.debug('Saving data for new ' + this._objectType + ' to database', 4);
}
else {
Zotero.debug('Updating database with new ' + this._objectType + ' data', 4);
}
if (Zotero.DataObject.prototype._finalizeSave == this._finalizeSave) {
throw new Error("_finalizeSave not implemented for Zotero." + this._ObjectType);
}

28
test/tests/undoHistoryTest.js
View file

@ -251,6 +251,34 @@ describe("Zotero.UndoHistory", function () {
assert.isFalse(Zotero.UndoHistory.canUndo());
assert.isFalse(Zotero.UndoHistory.canRedo());
});
it("should not leave an object unsaveable after an undo apply failure", async function () {
// A (move target), P (original parent), B (child being moved)
let collectionA = await createDataObject('collection', { name: 'A' });
let collectionP = await createDataObject('collection', { name: 'P' });
let collectionB = await createDataObject('collection', { name: 'B', parentID: collectionP.id });
// Move B from P onto A, recording an undo entry for the parent change
Zotero.UndoHistory.clear();
collectionB.parentID = collectionA.id;
await collectionB.saveTx({ undoAction: 'undo-action-move-collection' });
assert.isTrue(Zotero.UndoHistory.canUndo());
// Permanently erase P so its key no longer resolves to a collection
await collectionP.eraseTx();
// Undoing tries to set B's parent back to the now-erased P, which makes
// Collection._initSave throw. The apply fails and history is cleared, but
// B must not be left pinned to the vanished parent.
await Zotero.UndoHistory.undo();
// B should have been rolled back to its last valid parent (A) and remain
// editable
assert.equal(collectionB.parentID, collectionA.id);
collectionB.name = 'B renamed';
await collectionB.saveTx();
assert.equal(collectionB.name, 'B renamed');
});
});
describe("canUndo/canRedo", function () {