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

Merge branch 'master' into next53

Browse Source 
# Conflicts:
#	package-lock.json
#	src/routes/api/search.js
This commit is contained in:
zadam
2022-06-08 22:51:18 +02:00
parent 51bbc23270 e206d9cc68
commit 0f7fa7a7b7
7 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/routes/api/search.js
View File

@@ -7,15 +7,16 @@ const scriptService = require('../../services/script');
const searchService = require('../../services/search/services/search');
const bulkActionService = require("../../services/bulk_actions");
const {formatAttrForSearch} = require("../../services/attribute_formatter");
const utils = require("../../services/utils.js");
async function searchFromNoteInt(note) {
function searchFromNoteInt(note) {
let searchResultNoteIds;
const searchScript = note.getRelationValue('searchScript');
const searchString = note.getLabelValue('searchString');
if (searchScript) {
searchResultNoteIds = await searchFromRelation(note, 'searchScript');
searchResultNoteIds = searchFromRelation(note, 'searchScript');
} else {
const searchContext = new SearchContext({
fastSearch: note.hasLabel('fastSearch'),
@@ -57,7 +58,7 @@ async function searchFromNote(req) {
return await searchFromNoteInt(note);
}
async function searchAndExecute(req) {
function searchAndExecute(req) {
const note = becca.getNote(req.params.noteId);
if (!note) {
@@ -73,7 +74,7 @@ async function searchAndExecute(req) {
return [400, `Note ${req.params.noteId} is not a search note.`]
}
const searchResultNoteIds = await searchFromNoteInt(note);
const searchResultNoteIds = searchFromNoteInt(note);
bulkActionService.executeActions(note, searchResultNoteIds);
}