From 748979eafd44704af42df54f4195d118dec891ae Mon Sep 17 00:00:00 2001 From: zadam Date: Thu, 24 Sep 2020 23:13:27 +0200 Subject: [PATCH] fix note.text #1263 --- src/public/app/services/entrypoints.js | 2 +- src/services/search/services/parse.js | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/public/app/services/entrypoints.js b/src/public/app/services/entrypoints.js index c399cd5c1..5d09d5dbc 100644 --- a/src/public/app/services/entrypoints.js +++ b/src/public/app/services/entrypoints.js @@ -166,7 +166,7 @@ export default class Entrypoints extends Component { if (!response.success) { toastService.showError("Search failed: " + response.message, 10000); - return; + // even in this case we'll show the results } this.triggerEvent('searchResults', {results: response.results}); diff --git a/src/services/search/services/parse.js b/src/services/search/services/parse.js index e9098b730..44084ff0c 100644 --- a/src/services/search/services/parse.js +++ b/src/services/search/services/parse.js @@ -186,7 +186,11 @@ function getExpression(tokens, searchContext, level = 0) { i += 2; - return getFulltext([tokens[i]], searchContext); + return new OrExp([ + new PropertyComparisonExp('title', buildComparator('*=*', tokens[i].token)), + new NoteContentProtectedFulltextExp('*=*', [tokens[i].token]), + new NoteContentUnprotectedFulltextExp('*=*', [tokens[i].token]) + ]); } if (PropertyComparisonExp.isProperty(tokens[i].token)) {