gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 09:58:32 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix calendar widget when hoisted into hidden subtree

Browse Source
This commit is contained in:
zadam 2022-12-23 15:46:33 +01:00
parent c34bccf7e8
commit c6a05d8853
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/public/app/components/note_context.js
View File

@ -39,6 +39,8 @@ class NoteContext extends Component {
async setNote(inputNotePath, triggerSwitchEvent = true) { async setNote(inputNotePath, triggerSwitchEvent = true) {
const resolvedNotePath = await this.getResolvedNotePath(inputNotePath); const resolvedNotePath = await this.getResolvedNotePath(inputNotePath);
console.log("EEEEEE", inputNotePath, resolvedNotePath);
if (!resolvedNotePath) { if (!resolvedNotePath) {
return; return;
} }
@ -67,14 +69,14 @@ class NoteContext extends Component {
&& this.notePath.startsWith("root/_hidden") && this.notePath.startsWith("root/_hidden")
&& !this.note.hasLabel("keepCurrentHoisting") && !this.note.hasLabel("keepCurrentHoisting")
) { ) {
// hidden subtree displays only when hoisted so it doesn't make sense to keep root as hoisted note // hidden subtree displays only when hoisted, so it doesn't make sense to keep root as hoisted note
let hoistedNoteId = '_hidden'; let hoistedNoteId = '_hidden';
if (this.note.isLaunchBarConfig()) { if (this.note.isLaunchBarConfig()) {
hoistedNoteId = '_lbRoot'; hoistedNoteId = '_lbRoot';
} else if (this.note.isOptions()) { } else if (this.note.isOptions()) {
hoistedNoteId = 'options'; hoistedNoteId = '_options';
} }
await this.setHoistedNoteId(hoistedNoteId); await this.setHoistedNoteId(hoistedNoteId);

4
src/public/app/services/hoisted_note.js
View File

@ -54,8 +54,8 @@ async function checkNoteAccess(notePath, noteContext) {
const requestedNote = await froca.getNote(treeService.getNoteIdFromNotePath(resolvedNotePath)); const requestedNote = await froca.getNote(treeService.getNoteIdFromNotePath(resolvedNotePath));
const hoistedNote = await froca.getNote(hoistedNoteId); const hoistedNote = await froca.getNote(hoistedNoteId);
if (hoistedNote.hasAncestor('_hidden') if (!hoistedNote.hasAncestor('_hidden')
|| !await dialogService.confirm(`Requested note '${requestedNote.title}' is outside of hoisted note '${hoistedNote.title}' subtree and you must unhoist to access the note. Do you want to proceed with unhoisting?`)) { && !await dialogService.confirm(`Requested note '${requestedNote.title}' is outside of hoisted note '${hoistedNote.title}' subtree and you must unhoist to access the note. Do you want to proceed with unhoisting?`)) {
return false; return false;
} }