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

share tree should include branch prefixes, fixes #4096

Browse Source
This commit is contained in:
zadam
2023-07-17 22:19:03 +02:00
parent 84c4b368c8
commit d6a4f1db13
5 changed files with 34 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/share/routes.js
View File

@@ -9,21 +9,28 @@ const contentRenderer = require("./content_renderer");
const assetPath = require("../services/asset_path");
const appPath = require("../services/app_path");
/**
* @param {SNote} note
* @return {{note: SNote, branch: SBranch}|{}}
*/
function getSharedSubTreeRoot(note) {
if (note.noteId === shareRoot.SHARE_ROOT_NOTE_ID) {
// share root itself is not shared
return null;
return {};
}
// every path leads to share root, but which one to choose?
// for the sake of simplicity, URLs are not note paths
const parentNote = note.getParentNotes()[0];
const parentBranch = note.getParentBranches()[0];
if (parentNote.noteId === shareRoot.SHARE_ROOT_NOTE_ID) {
return note;
if (parentBranch.parentNoteId === shareRoot.SHARE_ROOT_NOTE_ID) {
return {
note,
branch: parentBranch
};
}
return getSharedSubTreeRoot(parentNote);
return getSharedSubTreeRoot(parentBranch.getParentNote());
}
function addNoIndexHeader(note, res) {