[courier] remove use of filtered_query

elastic · Jan 5, 2016 · dc4dec2 · dc4dec2
1 parent 1bece49
commit dc4dec2
Showing 1 changed file with 14 additions and 8 deletions.
diff --git a/src/ui/public/courier/data_source/_abstract.js b/src/ui/public/courier/data_source/_abstract.js
@@ -321,14 +321,20 @@ define(function (require) {
               });
 
               flatState.body.query = {
-                filtered: {
-                  query: flatState.body.query,
-                  filter: {
-                    bool: {
-                      must: _(flatState.filters).filter(filterNegate(false)).map(cleanFilter).value(),
-                      must_not: _(flatState.filters).filter(filterNegate(true)).map(cleanFilter).value()
-                    }
-                  }
+                bool: {
+                  must:
+                    [flatState.body.query]
+                    .concat(
+                      _(flatState.filters)
+                      .filter(filterNegate(false))
+                      .map(cleanFilter)
+                      .value()
+                    ),
+
+                  must_not:
+                    _(flatState.filters)
+                    .filter(filterNegate(true))
+                    .map(cleanFilter).value()
                 }
               };
             }