Merge remote-tracking branch 'origin/stable'

# Conflicts:
#	src/becca/becca_service.js
This commit is contained in:
zadam 2021-07-08 13:11:25 +02:00
commit 98ee3b029a

View File

@ -171,11 +171,20 @@ function getNotePath(noteId) {
if (retPath) {
const noteTitle = getNoteTitleForPath(retPath);
const parentNote = note.parents[0];
let branchId;
if (note.noteId === 'root') {
branchId = 'root';
}
else {
const parentNote = note.parents[0];
branchId = becca.getBranchFromChildAndParent(noteId, parentNote.noteId).branchId;
}
return {
noteId: noteId,
branchId: becca.getBranchFromChildAndParent(noteId, parentNote.noteId).branchId,
branchId: branchId,
title: noteTitle,
notePath: retPath,
path: retPath.join('/')