Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-30 18:05:55 +01:00
Code Issues Packages Projects Releases Activity

tree fixes

Browse Source
This commit is contained in:
zadam
2020-12-13 23:27:42 +01:00
parent 0bb548d0d1
commit 0a896cc19c
4 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/routes/api/tree.js
View File

@@ -21,6 +21,12 @@ function getNotesAndBranchesAndAttributes(noteIds) {
collectEntityIds(branch.parentNote);
}
for (const childNote of note.children) {
const childBranch = noteCache.getBranch(childNote.noteId, note.noteId);
collectedBranchIds.add(childBranch.branchId);
}
for (const attr of note.ownedAttributes) {
collectedAttributeIds.add(attr.attributeId);
@@ -51,7 +57,7 @@ function getNotesAndBranchesAndAttributes(noteIds) {
isProtected: note.isProtected,
type: note.type,
mime: note.mime,
isDeleted: note.isDeleted
isDeleted: false // FIXME
});
}
@@ -106,16 +112,16 @@ function getNotesAndBranchesAndAttributes(noteIds) {
function getTree(req) {
const subTreeNoteId = req.query.subTreeNoteId || 'root';
const collectedNoteIds = new Set(['root']);
const collectedNoteIds = new Set([subTreeNoteId]);
function collect(parentNote) {
for (const childNote of parentNote.children || []) {
for (const childNote of parentNote.children) {
collectedNoteIds.add(childNote.noteId);
const childBranch = noteCache.getBranch(childNote.noteId, parentNote.noteId);
if (childBranch.isExpanded) {
collect(childBranch);
collect(childBranch.childNote);
}
}
}