#1612 Use _in operator instead of _or

TheHive-Project · Nov 13, 2020 · eca41c7 · eca41c7
1 parent fc68d05
commit eca41c7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 20 deletions.
diff --git a/frontend/app/scripts/controllers/MainPageCtrl.js b/frontend/app/scripts/controllers/MainPageCtrl.js
@@ -9,16 +9,10 @@
                 self.view = {};
 
                 self.defaultFilter = {
-                    _or: [
-                        {
-                            _field: 'status',
-                            _value: 'Waiting'
-                        },
-                        {
-                            _field: 'status',
-                            _value: 'InProgress'
-                        }
-                    ]
+                    _in: {
+                        _field: 'status',
+                        _values: ['Waiting', 'InProgress']
+                    }
                 };
 
                 self.queryOperations = view === 'mytasks' ? [

diff --git a/frontend/app/scripts/controllers/RootCtrl.js b/frontend/app/scripts/controllers/RootCtrl.js
@@ -58,16 +58,10 @@ angular.module('theHiveControllers').controller('RootCtrl',
             {_name: 'currentUser'},
             {_name: 'tasks'},
             {_name: 'filter',
-                _or: [
-                    {
-                        _field: 'status',
-                        _value: 'Waiting'
-                    },
-                    {
-                        _field: 'status',
-                        _value: 'InProgress'
-                    }
-                ]
+                _in: {
+                    _field: 'status',
+                    _values: ['Waiting', 'InProgress']
+                }
             },
             {_name: 'count'}
         ], {