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

fix ordering

Browse Source
This commit is contained in:
azivner
2018-04-21 12:23:35 -04:00
parent 4ce5ea9886
commit 66e7c6de62
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/routes/api/login.js
View File

@@ -57,6 +57,7 @@ async function loginToProtectedSession(req) {
const protectedSessionId = protectedSessionService.setDataKey(decryptedDataKey); const protectedSessionId = protectedSessionService.setDataKey(decryptedDataKey);
// this is set here so that event handlers have access to the protected session
cls.namespace.set('protectedSessionId', protectedSessionId); cls.namespace.set('protectedSessionId', protectedSessionId);
eventService.emit(eventService.ENTER_PROTECTED_SESSION); eventService.emit(eventService.ENTER_PROTECTED_SESSION);

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

@@ -37,7 +37,7 @@ async function getTree() {
JOIN tree ON branches.parentNoteId = tree.noteId JOIN tree ON branches.parentNoteId = tree.noteId
WHERE tree.isExpanded = 1 AND branches.isDeleted = 0 WHERE tree.isExpanded = 1 AND branches.isDeleted = 0
) )
SELECT branches.* FROM tree JOIN branches USING(noteId)`); SELECT branches.* FROM tree JOIN branches USING(noteId) ORDER BY branches.notePosition`);
const noteIds = branches.map(b => b.noteId); const noteIds = branches.map(b => b.noteId);