diff options
| -rw-r--r-- | client/lib/filter.js | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/client/lib/filter.js b/client/lib/filter.js index 9f42068b..790e4f49 100644 --- a/client/lib/filter.js +++ b/client/lib/filter.js @@ -248,18 +248,16 @@ Filter = { const exceptionsSelector = {_id: {$in: this._exceptions}}; this._exceptionsDep.depend(); - console.log("Final Filter:"); - console.log({ - $or: [filterSelector, exceptionsSelector, this.advanced._getMongoSelector()], - }); - if (includeEmptySelectors) - return { - $or: [filterSelector, exceptionsSelector, this.advanced._getMongoSelector(), emptySelector], - }; - else - return { - $or: [filterSelector, exceptionsSelector, this.advanced._getMongoSelector()], - }; + + const selectors = [exceptionsSelector]; + + if (_.any(this._fields, (fieldName) => { + return this[fieldName]._isActive(); + })) selectors.push(filterSelector); + if (includeEmptySelectors) selectors.push(emptySelector); + if (this.advanced._isActive()) selectors.push(this.advanced._getMongoSelector()); + + return {$or: selectors}; }, mongoSelector(additionalSelector) { |