Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2026-02-25 09:24:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #6 from mario-orlicky/filter-by-empty

Browse source 
Filter by empty
This commit is contained in:
Lauri Ojansivu 2016-11-15 23:46:59 +02:00 • committed by GitHub
commit fa6267cf44
3 changed files with 37 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

25
client/lib/filter.js
View file

@ -63,6 +63,17 @@ class SetFilter {
this._dep.depend();
return { $in: this._selectedElements };
}
_getEmptySelector() {
this._dep.depend();
let includeEmpty = false
this._selectedElements.forEach((el) => {
if (el == undefined) {
includeEmpty = true;
}
});
return includeEmpty ? { $eq: [] } : null;
}
}
// The global Filter object.
@ -95,16 +106,26 @@ Filter = {
return {};
const filterSelector = {};
const emptySelector = {};
let includeEmptySelectors = false;
this._fields.forEach((fieldName) => {
const filter = this[fieldName];
if (filter._isActive())
if (filter._isActive()) {
filterSelector[fieldName] = filter._getMongoSelector();
emptySelector[fieldName] = filter._getEmptySelector();
if (emptySelector[fieldName] != null) {
includeEmptySelectors = true;
}
}
});
const exceptionsSelector = {_id: {$in: this._exceptions}};
this._exceptionsDep.depend();
return {$or: [filterSelector, exceptionsSelector]};
if (includeEmptySelectors)
return {$or: [filterSelector, exceptionsSelector, emptySelector]};
else
return {$or: [filterSelector, exceptionsSelector]};
},
mongoSelector(additionalSelector) {