mirror of
https://github.com/zadam/trilium.git
synced 2025-03-01 14:22:32 +01:00
Merge branch 'stable'
This commit is contained in:
commit
4da6234911
@ -2,7 +2,7 @@
|
|||||||
"name": "trilium",
|
"name": "trilium",
|
||||||
"productName": "Trilium Notes",
|
"productName": "Trilium Notes",
|
||||||
"description": "Trilium Notes",
|
"description": "Trilium Notes",
|
||||||
"version": "0.37.3",
|
"version": "0.37.4",
|
||||||
"license": "AGPL-3.0-only",
|
"license": "AGPL-3.0-only",
|
||||||
"main": "electron.js",
|
"main": "electron.js",
|
||||||
"bin": {
|
"bin": {
|
||||||
|
@ -1 +1 @@
|
|||||||
module.exports = { buildDate:"2019-11-19T23:05:54+01:00", buildRevision: "07043fb177afb9d754428a410b3019d53d7b6fa0" };
|
module.exports = { buildDate:"2019-11-22T22:38:03+01:00", buildRevision: "7a2c7edd7e9b975bf64f732629e711379baecf48" };
|
||||||
|
@ -35,9 +35,9 @@ async function searchForNoteIds(searchString) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const isInFilter = filters.find(filter => filter.name.toLowerCase() === 'in');
|
const isInFilters = filters.filter(filter => filter.name.toLowerCase() === 'in');
|
||||||
|
|
||||||
if (isInFilter) {
|
for (const isInFilter of isInFilters) {
|
||||||
if (isInFilter.operator === '=') {
|
if (isInFilter.operator === '=') {
|
||||||
noteIds = noteIds.filter(noteId => noteCacheService.isInAncestor(noteId, isInFilter.value));
|
noteIds = noteIds.filter(noteId => noteCacheService.isInAncestor(noteId, isInFilter.value));
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user