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

Merge branch 'stable'

Browse Source 
# Conflicts:
#	src/routes/api/revisions.js
#	src/services/bulk_actions.js
This commit is contained in:
zadam
2023-12-11 23:07:15 +01:00
parent c35167f2f5 0ac397e7ff
commit df85a5eee4
10 changed files with 40 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/services/tree.js
View File

@@ -209,8 +209,9 @@ function sortNotesIfNeeded(parentNoteId) {
function setNoteToParent(noteId, prefix, parentNoteId) {
const parentNote = becca.getNote(parentNoteId);
if (!parentNote) {
throw new Error(`Cannot move note to deleted parent note '${parentNoteId}'`);
if (parentNoteId && !parentNote) {
// null parentNoteId is a valid value
throw new Error(`Cannot move note to deleted / missing parent note '${parentNoteId}'`);
}
// case where there might be more such branches is ignored. It's expected there should be just one