From 39974c953247190fe373a583830d1ec3bc6899f7 Mon Sep 17 00:00:00 2001
From: IgnatzHome <ignatz@maschath.de>
Date: Sun, 20 May 2018 09:33:51 +0200
Subject: rewrite Filter._getMongoSelecto to not include Empty Filter.

---
 client/lib/filter.js | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

(limited to 'client/lib')

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) {
-- 
cgit v1.2.3-1-g7c22