From 6e69cafe5419e8efcc6f652647f9227dbcfa1e18 Mon Sep 17 00:00:00 2001 From: zadam Date: Thu, 8 Jun 2023 22:45:44 +0200 Subject: [PATCH] fix showing deleted notes in the recent changes dialog, closes #4013 --- src/routes/api/recent_changes.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/routes/api/recent_changes.js b/src/routes/api/recent_changes.js index 646898e9c..ca0a23c71 100644 --- a/src/routes/api/recent_changes.js +++ b/src/routes/api/recent_changes.js @@ -27,7 +27,8 @@ function getRecentChanges(req) { for (const noteRevisionRow of noteRevisionRows) { const note = becca.getNote(noteRevisionRow.noteId); - if (note?.hasAncestor(ancestorNoteId)) { + // for deleted notes, the becca note is null, and it's not possible to (easily) determine if it belongs to a subtree + if (ancestorNoteId === 'root' || note?.hasAncestor(ancestorNoteId)) { recentChanges.push(noteRevisionRow); } } @@ -43,8 +44,8 @@ function getRecentChanges(req) { notes.title AS current_title, notes.isProtected AS current_isProtected, notes.title, - notes.utcDateCreated AS utcDate, - notes.dateCreated AS date + notes.utcDateCreated AS utcDate, -- different from the second SELECT + notes.dateCreated AS date -- different from the second SELECT FROM notes UNION ALL SELECT @@ -54,15 +55,16 @@ function getRecentChanges(req) { notes.title AS current_title, notes.isProtected AS current_isProtected, notes.title, - notes.utcDateModified AS utcDate, - notes.dateModified AS date + notes.utcDateModified AS utcDate, -- different from the first SELECT + notes.dateModified AS date -- different from the first SELECT FROM notes WHERE notes.isDeleted = 1`); for (const noteRow of noteRows) { const note = becca.getNote(noteRow.noteId); - if (note?.hasAncestor(ancestorNoteId)) { + // for deleted notes, the becca note is null, and it's not possible to (easily) determine if it belongs to a subtree + if (ancestorNoteId === 'root' || note?.hasAncestor(ancestorNoteId)) { recentChanges.push(noteRow); } }