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

Return created/existing branch in EnsureNoteIsPresentInParent

Browse Source
This commit is contained in:
Kara
2023-05-01 12:41:22 -05:00
parent 4f1fafdf75
commit 53c87f3d25
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/services/tree.js
View File

@@ -31,12 +31,12 @@ function getNotes(noteIds) {
function validateParentChild(parentNoteId, childNoteId, branchId = null) {
if (['root', '_hidden', '_share', '_lbRoot', '_lbAvailableLaunchers', '_lbVisibleLaunchers'].includes(childNoteId)) {
return { success: false, message: `Cannot change this note's location.`};
return { branch: null, success: false, message: `Cannot change this note's location.`};
}
if (parentNoteId === 'none') {
// this shouldn't happen
return { success: false, message: `Cannot move anything into 'none' parent.` };
return { branch: null, success: false, message: `Cannot move anything into 'none' parent.` };
}
const existing = getExistingBranch(parentNoteId, childNoteId);
@@ -46,6 +46,7 @@ function validateParentChild(parentNoteId, childNoteId, branchId = null) {
const childNote = becca.getNote(childNoteId);
return {
branch: existing,
success: false,
message: `Note "${childNote.title}" note already exists in the "${parentNote.title}".`
};
@@ -53,6 +54,7 @@ function validateParentChild(parentNoteId, childNoteId, branchId = null) {
if (!checkTreeCycle(parentNoteId, childNoteId)) {
return {
branch: null,
success: false,
message: 'Moving/cloning note here would create cycle.'
};
@@ -60,12 +62,13 @@ function validateParentChild(parentNoteId, childNoteId, branchId = null) {
if (parentNoteId !== '_lbBookmarks' && becca.getNote(parentNoteId).type === 'launcher') {
return {
branch: null,
success: false,
message: 'Launcher note cannot have any children.'
};
}
return { success: true };
return { branch: null, success: true };
}
function getExistingBranch(parentNoteId, childNoteId) {