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

* Fix bug with multiple label predicates

Browse source 
* Add new constants
This commit is contained in:
John R. Supplee 2021-04-03 01:19:02 +02:00
parent 69dc8f304c
commit 302ba75729
7 changed files with 88 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

18
server/publications/cards.js
View file

@ -102,7 +102,7 @@ function buildSelector(queryParams) {
let selector = {};
// eslint-disable-next-line no-console
// console.log('queryParams:', queryParams);
console.log('queryParams:', queryParams);
if (queryParams.selector) {
selector = queryParams.selector;
@ -291,9 +291,8 @@ function buildSelector(queryParams) {
});
if (queryParams.hasOperator(OPERATOR_LABEL)) {
const queryLabels = [];
queryParams.getPredicates(OPERATOR_LABEL).forEach(label => {
const queryLabels = [];
let boards = Boards.userBoards(userId, null, {
labels: { $elemMatch: { color: label.toLowerCase() } },
});
@ -339,9 +338,12 @@ function buildSelector(queryParams) {
errors.addNotFound(OPERATOR_LABEL, label);
}
}
selector.labelIds = { $in: _.uniq(queryLabels) };
});
if (queryLabels.length) {
// eslint-disable-next-line no-console
// console.log('queryLabels:', queryLabels);
selector.labelIds = { $in: _.uniq(queryLabels) };
}
}
if (queryParams.hasOperator(OPERATOR_HAS)) {
@ -597,9 +599,9 @@ function findCards(sessionId, query) {
// eslint-disable-next-line no-console
// console.log('projection:', projection);
let cards;
if (!query.hasErrors()) {
cards = Cards.find(query.selector, query.projection);
}
// if (!query.hasErrors()) {
cards = Cards.find(query.selector, query.projection);
// }
// eslint-disable-next-line no-console
// console.log('count:', cards.count());