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

proper handling of deleted notes

Browse Source
This commit is contained in:
zadam
2020-03-23 16:39:03 +01:00
parent 978575498c
commit cb168218fb
5 changed files with 48 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/public/javascripts/services/tab_context.js
View File

@@ -25,19 +25,28 @@ class TabContext extends Component {
}
async setNote(inputNotePath, triggerSwitchEvent = true) {
const notePath = await treeService.resolveNotePath(inputNotePath);
const noteId = treeService.getNoteIdFromNotePath(inputNotePath);
let notePath;
if (!notePath) {
console.error(`Cannot resolve note path ${inputNotePath}`);
return;
if ((await treeCache.getNote(noteId)).isDeleted) {
// no point in trying to resolve canonical notePath
notePath = inputNotePath;
}
else {
notePath = await treeService.resolveNotePath(inputNotePath);
if (notePath === this.notePath) {
return;
}
if (!notePath) {
console.error(`Cannot resolve note path ${inputNotePath}`);
return;
}
if (await hoistedNoteService.checkNoteAccess(notePath) === false) {
return; // note is outside of hoisted subtree and user chose not to unhoist
if (notePath === this.notePath) {
return;
}
if (await hoistedNoteService.checkNoteAccess(notePath) === false) {
return; // note is outside of hoisted subtree and user chose not to unhoist
}
}
await this.triggerEvent('beforeNoteSwitch', {tabContext: this});
@@ -45,7 +54,7 @@ class TabContext extends Component {
utils.closeActiveDialog();
this.notePath = notePath;
this.noteId = treeService.getNoteIdFromNotePath(notePath);
this.noteId = noteId;
this.autoBookDisabled = false;