mirror of
https://github.com/zadam/trilium.git
synced 2025-03-01 14:22:32 +01:00
Merge remote-tracking branch 'origin/stable'
# Conflicts: # src/becca/becca_service.js
This commit is contained in:
commit
98ee3b029a
@ -171,11 +171,20 @@ function getNotePath(noteId) {
|
|||||||
|
|
||||||
if (retPath) {
|
if (retPath) {
|
||||||
const noteTitle = getNoteTitleForPath(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 {
|
return {
|
||||||
noteId: noteId,
|
noteId: noteId,
|
||||||
branchId: becca.getBranchFromChildAndParent(noteId, parentNote.noteId).branchId,
|
branchId: branchId,
|
||||||
title: noteTitle,
|
title: noteTitle,
|
||||||
notePath: retPath,
|
notePath: retPath,
|
||||||
path: retPath.join('/')
|
path: retPath.join('/')
|
||||||
|
Loading…
x
Reference in New Issue
Block a user