Merge pull request #203 from tmanninger/master

Elasticsearch 6 search support
etsy · Mar 29, 2019 · 0055090 · 0055090
2 parents d53751d + 8d47676
commit 0055090
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/htdocs/assets/js/views/alerts/alerts.js b/htdocs/assets/js/views/alerts/alerts.js
@@ -120,7 +120,7 @@ define(function(require) {
 
             var default_search = this.App.Data.User.get('settings')['default'];
             var query = Util.parseQuery(window.location.href);
-            var query_string = query.query || default_search || 'state:(0 1)';
+            var query_string = query.query || default_search || 'state:(0 OR 1)';
 
             var queries = this.App.Data.User.get('settings')['queries'] || [];
             for(var i = 0; i < queries.length; ++i) {

diff --git a/htdocs/assets/js/views/searches/search.js b/htdocs/assets/js/views/searches/search.js
@@ -302,7 +302,7 @@ define(function(require) {
         },
         gotoAlerts: function() {
             this.App.Router.navigate('/alerts?' + decodeURIComponent($.param({
-                query: 'state:(0 1) AND search_id:' + this.model.id
+                query: 'state:(0 OR 1) AND search_id:' + this.model.id
             })), {trigger: true});
         }
     });