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

sharing improvements

Browse Source
This commit is contained in:
zadam
2021-12-23 20:54:48 +01:00
parent 972f2f40bf
commit 47845930f4
4 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/share/routes.js
View File

@@ -3,18 +3,21 @@ const shacaLoader = require("./shaca/shaca_loader");
const shareRoot = require("./share_root");
const contentRenderer = require("./content_renderer.js");
function getSubRoot(note) {
function getSharedSubTreeRoot(note) {
if (note.noteId === shareRoot.SHARE_ROOT_NOTE_ID) {
// share root itself is not shared
return null;
}
// every path leads to share root, but which one to choose?
// for sake of simplicity URLs are not note paths
const parentNote = note.getParentNotes()[0];
if (parentNote.noteId === shareRoot.SHARE_ROOT_NOTE_ID) {
return note;
}
return getSubRoot(parentNote);
return getSharedSubTreeRoot(parentNote);
}
function register(router) {
@@ -28,7 +31,7 @@ function register(router) {
if (note) {
const content = contentRenderer.getContent(note);
const subRoot = getSubRoot(note);
const subRoot = getSharedSubTreeRoot(note);
res.render("share/page", {
note,