Merge pull request #4635 from WantToLearnJapanese/WantToLearnJapanese…

…-patch-unhoist-bookmark Fix showing unhoist confirm dialogue for bookmarked notes.
zadam · Feb 16, 2024 · 4ef31ea · 4ef31ea
2 parents 2d86557 + a939599
commit 4ef31ea
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;
         }