mirror of
				https://github.com/zadam/trilium.git
				synced 2025-11-04 05:28:59 +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) {
 | 
			
		||||
        const noteTitle = getNoteTitleForPath(retPath);
 | 
			
		||||
 | 
			
		||||
        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('/')
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user