Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 10:26:08 +01:00
Code Issues Packages Projects Releases Activity

delete note through its entity instead of manually with SQL, closes #303

Browse Source
This commit is contained in:
azivner
2019-01-13 00:24:51 +01:00
parent 348562352c
commit b115a7cf19
5 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/services/notes.js
View File

@@ -359,18 +359,8 @@ async function deleteNote(branch) {
const notDeletedBranches = await note.getBranches();
if (notDeletedBranches.length === 0) {
// maybe a bit counter-intuitively, protected notes can be deleted also outside of protected session
// this is because protected notes offer only confidentiality which makes some things simpler - e.g. deletion UI
// to allow this, we just set the isDeleted flag, otherwise saving would fail because of attempt to encrypt
// content with non-existent protected session key
// we don't reset content here, that's postponed and done later to give the user a chance to correct a mistake
await sql.execute("UPDATE notes SET isDeleted = 1 WHERE noteId = ?", [note.noteId]);
// need to manually trigger sync since it's not taken care of by note save
await syncTableService.addNoteSync(note.noteId);
for (const noteRevision of await note.getRevisions()) {
await noteRevision.save();
}
note.isDeleted = true;
await note.save();
for (const childBranch of await note.getChildBranches()) {
await deleteNote(childBranch);