brought over changes from 879035d

The last known good state before I got sidetracked into docker changes
This commit is contained in:
matt wilkie
2025-02-16 21:29:38 -07:00
parent 152f3193d1
commit 7af4e52766
5 changed files with 17 additions and 4 deletions

View File

@@ -16,6 +16,7 @@ import type SNote from "./shaca/entities/snote.js";
import type SBranch from "./shaca/entities/sbranch.js";
import type SAttachment from "./shaca/entities/sattachment.js";
import utils from "../services/utils.js";
import optionService from '../services/option_service.js';
function getSharedSubTreeRoot(note: SNote): { note?: SNote; branch?: SBranch } {
if (note.noteId === shareRoot.SHARE_ROOT_NOTE_ID) {
@@ -151,7 +152,8 @@ function register(router: Router) {
const { header, content, isEmpty } = contentRenderer.getContent(note);
const subRoot = getSharedSubTreeRoot(note);
const opts = { note, header, content, isEmpty, subRoot, assetPath, appPath };
const showLoginInShareTheme = optionService.getOption('showLoginInShareTheme');
const opts = { note, header, content, isEmpty, subRoot, assetPath, appPath, showLoginInShareTheme };
let useDefaultView = true;
// Check if the user has their own template