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

Merge branch 'master' into dev

Browse Source 
# Conflicts:
#	package-lock.json
#	package.json
#	src/public/app/widgets/dialogs/note_revisions.js
#	src/services/handlers.js
#	src/services/hidden_subtree.js
#	src/services/search/services/parse.js
This commit is contained in:
zadam
2023-01-17 22:20:10 +01:00
parent 2fa1d812f6 ef825371cf
commit 6a6ae359b6
30 changed files with 167 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/services/notes.js
View File

@@ -108,8 +108,13 @@ function getAndValidateParent(params) {
throw new ValidationError(`Only 'launcher' notes can be created in parent '${params.parentNoteId}'`);
}
if (!params.ignoreForbiddenParents && (['_lbRoot', '_hidden'].includes(parentNote.noteId) || parentNote.isOptions())) {
throw new ValidationError(`Creating child notes into '${parentNote.noteId}' is not allowed.`);
if (!params.ignoreForbiddenParents) {
if (['_lbRoot', '_hidden'].includes(parentNote.noteId)
|| parentNote.noteId.startsWith("_lbTpl")
|| parentNote.isOptions()) {
throw new ValidationError(`Creating child notes into '${parentNote.noteId}' is not allowed.`);
}
}
return parentNote;
@@ -283,8 +288,12 @@ function protectNote(note, protect) {
note.isProtected = protect;
// this will force de/encryption
note.setContent(content);
// see https://github.com/zadam/trilium/issues/3523
// IIRC a zero-sized buffer can be returned as null from the database
if (content !== null) {
// this will force de/encryption
note.setContent(content);
}
note.save();
}
@@ -592,11 +601,6 @@ function updateNoteContent(noteId, content) {
content = saveLinks(note, content);
note.setContent(content);
eventService.emit(eventService.ENTITY_CHANGED, {
entityName: 'note_contents',
entity: note
});
}
/**