sascha
/
Notes
mirror of https://github.com/TriliumNext/Notes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

correct reloading of note subtree when relevant labels change

pull/255/head
zadam 2021-02-09 20:26:10 +07:00
parent 0040334e89
commit 7dd19c0366
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/public/app/entities/note_short.js
Unescape Escape View File

@ -508,13 +508,13 @@ class NoteShort {
visitedNoteIds.add(this.noteId);
for (const templateNote of this.getTemplateNotes()) {
if (templateNote.hasAncestor(ancestorNote)) {
if (templateNote.hasAncestor(ancestorNote, visitedNoteIds)) {
return true;
}
}
for (const parentNote of this.getParentNotes()) {
if (parentNote.hasAncestor(ancestorNote)) {
if (parentNote.hasAncestor(ancestorNote, visitedNoteIds)) {
return true;
}
}

2
src/public/app/widgets/note_tree.js
Unescape Escape View File

@ -1030,7 +1030,7 @@ export default class NoteTreeWidget extends TabAwareWidget {
const noteIdsToReload = new Set();
for (const attr of loadResults.getAttributes()) {
if (attr.type === 'label' && ['iconClass', 'cssClass'].includes(attr.name)) {
if (attr.type === 'label' && ['iconClass', 'cssClass', 'workspace', 'workspaceIconClass', 'archived'].includes(attr.name)) {
if (attr.isInheritable) {
noteIdsToReload.add(attr.noteId);
}