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

sync error mitigation

Browse Source
This commit is contained in:
zadam
2019-12-17 22:17:03 +01:00
parent eb4dfbad92
commit 21fab412cb
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,6 +10,8 @@ async function getNotesAndBranches(noteIds) {
noteIds = notes.map(n => n.noteId); noteIds = notes.map(n => n.noteId);
// joining child note to filter out not completely synchronised notes which would then cause errors later
// cannot do that with parent because of root note's 'none' parent
const branches = await sql.getManyRows(` const branches = await sql.getManyRows(`
SELECT SELECT
branches.branchId, branches.branchId,
@@ -19,6 +21,7 @@ async function getNotesAndBranches(noteIds) {
branches.prefix, branches.prefix,
branches.isExpanded branches.isExpanded
FROM branches FROM branches
JOIN notes AS child ON child.noteId = branches.noteId
WHERE branches.isDeleted = 0 WHERE branches.isDeleted = 0
AND (branches.noteId IN (???) OR parentNoteId IN (???))`, noteIds); AND (branches.noteId IN (???) OR parentNoteId IN (???))`, noteIds);