Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-13 16:55:50 +01:00
Code Issues Packages Projects Releases Activity

WIP per-tab hoisting

Browse Source
This commit is contained in:
zadam
2020-11-23 23:11:21 +01:00
parent 52b8162d01
commit ac636b6649
5 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/routes/api/autocomplete.js
View File

@@ -5,7 +5,7 @@ const searchService = require('../../services/search/services/search.js');
const repository = require('../../services/repository');
const log = require('../../services/log');
const utils = require('../../services/utils');
const optionService = require('../../services/options');
const cls = require('../../services/cls');
function getAutocomplete(req) {
const query = req.query.query.trim();
@@ -35,7 +35,7 @@ function getRecentNotes(activeNoteId) {
let extraCondition = '';
const params = [activeNoteId];
const hoistedNoteId = optionService.getOption('hoistedNoteId');
const hoistedNoteId = cls.getHoistedNoteId();
if (hoistedNoteId !== 'root') {
extraCondition = `AND recent_notes.notePath LIKE ?`;
params.push(hoistedNoteId + '%');

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

@@ -84,7 +84,7 @@ function getTree(req) {
)
SELECT noteId FROM treeWithDescendantsAscendantsAndTemplates`, [subTreeNoteId, subTreeNoteId]);
noteIds.push(subTreeNoteId);console.log("noteIds", noteIds);
noteIds.push(subTreeNoteId);
return getNotesAndBranchesAndAttributes(noteIds);
}