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

update correctly "multi-parent" node status, fixes #1688

Browse Source
This commit is contained in:
zadam
2021-02-25 21:16:21 +01:00
parent 7572ee284b
commit cb6d35236c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/public/app/widgets/component.js
View File

@@ -92,7 +92,7 @@ export default class Component {
} }
if (glob.isDev) { if (glob.isDev) {
await utils.timeLimit(promise, 3000, `Time limit failed on ${this.constructor.name} with ${fun.name}`); await utils.timeLimit(promise, 20000, `Time limit failed on ${this.constructor.name} with ${fun.name}`);
} }
else { else {
// cheaper and in non-dev the extra reporting is lost anyway through reload // cheaper and in non-dev the extra reporting is lost anyway through reload

6
src/public/app/widgets/note_tree.js
View File

@@ -1030,6 +1030,9 @@ export default class NoteTreeWidget extends TabAwareWidget {
} }
for (const branch of loadResults.getBranches()) { for (const branch of loadResults.getBranches()) {
// adding noteId itself to update all potential clones
noteIdsToUpdate.add(branch.noteId);
for (const node of this.getNodesByBranchId(branch.branchId)) { for (const node of this.getNodesByBranchId(branch.branchId)) {
if (branch.isDeleted) { if (branch.isDeleted) {
if (node.isActive()) { if (node.isActive()) {
@@ -1048,9 +1051,6 @@ export default class NoteTreeWidget extends TabAwareWidget {
noteIdsToUpdate.add(branch.parentNoteId); noteIdsToUpdate.add(branch.parentNoteId);
} }
else {
noteIdsToUpdate.add(branch.noteId);
}
} }
if (!branch.isDeleted) { if (!branch.isDeleted) {