Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-01 02:45:54 +01:00
Code Issues Packages Projects Releases Activity

fix deleting notes

Browse Source
This commit is contained in:
azivner
2017-11-19 23:12:39 -05:00
parent aeeb35101e
commit 4c0315d2bf
3 changed files with 73 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
services/notes.js
View File

@@ -218,22 +218,27 @@ async function addNoteAudits(origNote, newNote, browserId) {
}
async function deleteNote(noteId, browserId) {
async function deleteNote(noteTreeId, browserId) {
const now = utils.nowTimestamp();
await sql.execute("update notes_tree set is_deleted = 1, date_modified = ? where note_tree_id = ?", [now, noteTreeId]);
await sync_table.addNoteTreeSync(noteTreeId);
const children = await sql.getResults("select note_id from notes_tree where note_pid = ? and is_deleted = 0", [noteId]);
const noteId = await sql.getSingleValue("SELECT note_id FROM notes_tree WHERE note_tree_id = ?", [noteTreeId]);
for (const child of children) {
await deleteNote(child.note_id, browserId);
const notDeletedNoteTreesCount = await sql.getSingleValue("SELECT COUNT(*) FROM notes_tree WHERE note_id = ?", [noteId]);
if (!notDeletedNoteTreesCount) {
await sql.execute("update notes set is_deleted = 1, date_modified = ? where note_id = ?", [now, noteTreeId]);
await sync_table.addNoteSync(noteTreeId);
const children = await sql.getResults("select note_tree_id from notes_tree where note_pid = ? and is_deleted = 0", [noteTreeId]);
for (const child of children) {
await deleteNote(child.note_tree_id, browserId);
}
await sql.addAudit(audit_category.DELETE_NOTE, browserId, noteTreeId);
}
await sql.execute("update notes_tree set is_deleted = 1, date_modified = ? where note_id = ?", [now, noteId]);
await sql.execute("update notes set is_deleted = 1, date_modified = ? where note_id = ?", [now, noteId]);
await sync_table.addNoteTreeSync(noteId);
await sync_table.addNoteSync(noteId);
await sql.addAudit(audit_category.DELETE_NOTE, browserId, noteId);
}
module.exports = {