Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2026-02-23 16:34:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge pull request #4082 from mfilser/board_search_remove_limit

Browse source 
Board search remove limit
This commit is contained in:
Lauri Ojansivu 2021-10-27 08:37:31 +03:00 • committed by GitHub
commit b09e5b2680
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 40 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

71
models/boards.js
View file

@ -941,42 +941,51 @@ Boards.helpers({
},
searchLists(term) {
check(term, Match.OneOf(String, null, undefined));
const query = { boardId: this._id };
if (this.isTemplatesBoard()) {
query.type = 'template-list';
query.archived = false;
} else {
query.type = { $nin: ['template-list'] };
}
const projection = { limit: 10, sort: { createdAt: -1 } };
let ret = null;
if (term) {
const regex = new RegExp(term, 'i');
query.$or = [{ title: regex }, { description: regex }];
check(term, Match.OneOf(String));
term = term.trim();
}
if (term) {
const query = { boardId: this._id };
if (this.isTemplatesBoard()) {
query.type = 'template-list';
query.archived = false;
} else {
query.type = { $nin: ['template-list'] };
}
const projection = { sort: { createdAt: -1 } };
return Lists.find(query, projection);
if (term) {
const regex = new RegExp(term, 'i');
query.$or = [{ title: regex }, { description: regex }];
}
ret = Lists.find(query, projection);
}
return ret;
},
searchCards(term, excludeLinked) {
check(term, Match.OneOf(String, null, undefined));
const query = { boardId: this._id };
if (excludeLinked) {
query.linkedId = null;
}
if (this.isTemplatesBoard()) {
query.type = 'template-card';
query.archived = false;
} else {
query.type = { $nin: ['template-card'] };
}
const projection = { limit: 10, sort: { createdAt: -1 } };
let ret = null;
if (term) {
check(term, Match.OneOf(String));
term = term.trim();
}
if (term) {
const query = { boardId: this._id };
if (excludeLinked) {
query.linkedId = null;
}
if (this.isTemplatesBoard()) {
query.type = 'template-card';
query.archived = false;
} else {
query.type = { $nin: ['template-card'] };
}
const projection = { sort: { createdAt: -1 } };
const regex = new RegExp(term, 'i');
query.$or = [
@ -984,9 +993,9 @@ Boards.helpers({
{ description: regex },
{ customFields: { $elemMatch: { value: regex } } },
];
ret = Cards.find(query, projection);
}
return Cards.find(query, projection);
return ret;
},
// A board alwasy has another board where it deposits subtasks of thasks
// that belong to itself.