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 infinite cycle when template is descendant of an instance

Browse Source
This commit is contained in:
zadam 2021-02-09 20:15:14 +01:00
parent 96a5cb23f3
commit 0040334e89
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/public/app/entities/note_short.js
View File

@ -493,11 +493,20 @@ class NoteShort {
}); });
} }
hasAncestor(ancestorNote) { hasAncestor(ancestorNote, visitedNoteIds) {
if (this.noteId === ancestorNote.noteId) { if (this.noteId === ancestorNote.noteId) {
return true; return true;
} }
if (!visitedNoteIds) {
visitedNoteIds = new Set();
} else if (visitedNoteIds.has(this.noteId)) {
// to avoid infinite cycle when template is descendent of the instance
return false;
}
visitedNoteIds.add(this.noteId);
for (const templateNote of this.getTemplateNotes()) { for (const templateNote of this.getTemplateNotes()) {
if (templateNote.hasAncestor(ancestorNote)) { if (templateNote.hasAncestor(ancestorNote)) {
return true; return true;