Merge remote-tracking branch 'origin/master'

Mark3xtrm · Feb 16, 2024 · e6dec70 · e6dec70
2 parents 450b52f + 4ef31ea
commit e6dec70
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/public/app/services/hoisted_note.js b/src/public/app/services/hoisted_note.js
@@ -48,11 +48,11 @@ async function checkNoteAccess(notePath, noteContext) {
 
  const hoistedNoteId = noteContext.hoistedNoteId;
 
- if (!resolvedNotePath.includes(hoistedNoteId) && !resolvedNotePath.includes('_hidden')) {
+ if (!resolvedNotePath.includes(hoistedNoteId) && (!resolvedNotePath.includes('_hidden') || resolvedNotePath.includes('_lbBookmarks')) {
  const requestedNote = await froca.getNote(treeService.getNoteIdFromUrl(resolvedNotePath));
  const hoistedNote = await froca.getNote(hoistedNoteId);
 
- if (!hoistedNote.hasAncestor('_hidden')
+ if ((!hoistedNote.hasAncestor('_hidden') || resolvedNotePath.includes('_lbBookmarks'))
  && !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;
  }