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

recent notes and jump to note are filtered by hoisted note

Browse Source
This commit is contained in:
azivner
2018-12-12 21:28:38 +01:00
parent 86fcbb0354
commit 6c16cdb011
3 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,6 +3,8 @@
const noteCacheService = require('../../services/note_cache');
const repository = require('../../services/repository');
const log = require('../../services/log');
const utils = require('../../services/utils');
const optionService = require('../../services/options');
async function getAutocomplete(req) {
const query = req.query.query;
@@ -16,7 +18,7 @@ async function getAutocomplete(req) {
results = await getRecentNotes(currentNoteId);
}
else {
results = noteCacheService.findNotes(query);
results = await noteCacheService.findNotes(query);
}
const msTaken = Date.now() - timestampStarted;
@@ -29,6 +31,13 @@ async function getAutocomplete(req) {
}
async function getRecentNotes(currentNoteId) {
let extraCondition = '';
const hoistedNoteId = await optionService.getOption('hoistedNoteId');
if (hoistedNoteId !== 'root') {
extraCondition = `AND recent_notes.notePath LIKE '%${utils.sanitizeSql(hoistedNoteId)}%'`;
}
const recentNotes = await repository.getEntities(`
SELECT
recent_notes.*
@@ -39,6 +48,7 @@ async function getRecentNotes(currentNoteId) {
recent_notes.isDeleted = 0
AND branches.isDeleted = 0
AND branches.noteId != ?
${extraCondition}
ORDER BY
dateCreated DESC
LIMIT 200`, [currentNoteId]);