Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2026-01-31 13:45:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'master' of https://github.com/slvrpdr/wekan into slvrpdr-master

Browse source
This commit is contained in:
Lauri Ojansivu 2020-04-04 00:42:14 +03:00
commit b424b34cab
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
i18n/en.i18n.json
View file

@ -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",

6
models/boards.js
View file

@ -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);