self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-11-29 22:48:10 +02:00
Code Issues Releases Activity

Desktop, Mobile: Fix historic issue whereby the first revision created for a note does not contain the original contents (#12674)

Browse Source 
Co-authored-by: Laurent Cozic <laurent22@users.noreply.github.com>
This commit is contained in:
mrjo118
2025-10-09 22:35:08 +01:00
committed by GitHub
parent af5287de99
commit 53035839a5
5 changed files with 251 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
packages/lib/models/Note.ts
View File

@@ -806,13 +806,28 @@ export default class Note extends BaseItem {
// This is necessary for example so that the folder list is not refreshed every time a note is changed.
// Now it can look at the properties and refresh only if the "parent_id" property is changed.
// Trying to fix: https://github.com/laurent22/joplin/issues/3893
// 2025-09-22: Because we previously only stored the latest previous note contents, this meant that
// the original note contents would be overwritten if save is called multiple times on a note, between
// revision collections. In order to retain the original note contents at the point of the last revision
// collection (which may not have created a revision due to the intervalBetweenRevisions restriction), we
// now cache note ids for notes which were changed since the last collection, in order to determine whether
// we should set beforeNoteJson to the current contents in the database, or the last value which was stored
// in the item_changes table
const oldNote = !isNew && o.id ? await Note.load(o.id) : null;
syncDebugLog.info('Save Note: P:', oldNote);
let beforeNoteJson = null;
if (oldNote && this.revisionService().isOldNote(o.id)) {
beforeNoteJson = JSON.stringify(oldNote);
// Only update the beforeNoteJson if encryption is not applied, to avoid creating a faulty revision if an encrypted profile
// has just been downloaded from the sync target and save is invoked when the note has not yet been decrypted
if (oldNote && !oldNote.encryption_applied) {
const changedSinceCollection = this.revisionService().changedSinceCollection(o.id);
if (changedSinceCollection) {
beforeNoteJson = await ItemChange.oldNoteContent(o.id);
} else {
beforeNoteJson = JSON.stringify(oldNote);
}
}
const changedFields = [];