From eca41c7d91e82b25c3ebc8d2ceb77c00cac28c88 Mon Sep 17 00:00:00 2001
From: Nabil Adouani <nabil.adouani@gmail.com>
Date: Fri, 6 Nov 2020 16:07:04 +0100
Subject: [PATCH] #1612 Use _in operator instead of _or

---
 frontend/app/scripts/controllers/MainPageCtrl.js | 14 ++++----------
 frontend/app/scripts/controllers/RootCtrl.js     | 14 ++++----------
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/frontend/app/scripts/controllers/MainPageCtrl.js b/frontend/app/scripts/controllers/MainPageCtrl.js
index 116f9e1579..8320212b90 100644
--- 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
index 26e6982dc3..15341e81f2 100644
--- 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'}
         ], {