summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2020-04-04 00:42:14 +0300
committerLauri Ojansivu <x@xet7.org>2020-04-04 00:42:14 +0300
commitb424b34cab33816a0375a73ac86bc32edbc64103 (patch)
tree4f8c7261cf60180b1ee5f4818107ef63507d2bc9
parent45a83da7be455f5121c474dca0a7fa7efccf3945 (diff)
parent6e86292b997d40e36822efd10d6940e93da4abd0 (diff)
downloadwekan-b424b34cab33816a0375a73ac86bc32edbc64103.tar.gz
wekan-b424b34cab33816a0375a73ac86bc32edbc64103.tar.bz2
wekan-b424b34cab33816a0375a73ac86bc32edbc64103.zip
Merge branch 'master' of https://github.com/slvrpdr/wekan into slvrpdr-master
-rw-r--r--i18n/en.i18n.json2
-rw-r--r--models/boards.js6
2 files changed, 6 insertions, 2 deletions
diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json
index e3b3288d..bc07e934 100644
--- a/i18n/en.i18n.json
+++ b/i18n/en.i18n.json
@@ -440,7 +440,7 @@
"save": "Save",
"search": "Search",
"rules": "Rules",
- "search-cards": "Search from card/list titles and descriptions on this board",
+ "search-cards": "Search from card/list titles, descriptions and custom fields on this board",
"search-example": "Text to search for?",
"select-color": "Select Color",
"set-wip-limit-value": "Set a limit for the maximum number of tasks in this list",
diff --git a/models/boards.js b/models/boards.js
index 8862f301..35ee1a36 100644
--- a/models/boards.js
+++ b/models/boards.js
@@ -806,7 +806,11 @@ Boards.helpers({
if (term) {
const regex = new RegExp(term, 'i');
- query.$or = [{ title: regex }, { description: regex }];
+ query.$or = [
+ { title: regex },
+ { description: regex },
+ { customFields: { $elemMatch: { value: regex } } },
+ ];
}
return Cards.find(query, projection);