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

don't allow deleting hoisted note + other related fixes, closes #488

Browse Source
This commit is contained in:
zadam
2019-04-16 21:40:04 +02:00
parent 3760835608
commit 064a11d872
12 changed files with 66 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/services/notes.js
View File

@@ -12,6 +12,7 @@ const Link = require('../entities/link');
const NoteRevision = require('../entities/note_revision');
const Branch = require('../entities/branch');
const Attribute = require('../entities/attribute');
const hoistedNoteService = require('../services/hoisted_note');
async function getNewNotePosition(parentNoteId, noteData) {
let newNotePos = 0;
@@ -364,7 +365,10 @@ async function deleteNote(branch) {
return;
}
if (branch.branchId === 'root' || branch.noteId === 'root') {
if (branch.branchId === 'root'
|| branch.noteId === 'root'
|| branch.noteId === await hoistedNoteService.getHoistedNoteId()) {
throw new Error("Can't delete root branch/note");
}