From dd1098a6c44a65f4bd7a39beb521da2ec9ac34cd Mon Sep 17 00:00:00 2001 From: Damien <damien.burel@maarch.org> Date: Fri, 27 Apr 2018 11:03:58 +0200 Subject: [PATCH] FEAT #7387 Fix sql request --- src/core/controllers/AutoCompleteController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/controllers/AutoCompleteController.php b/src/core/controllers/AutoCompleteController.php index f00c9667f6b..5da59ae8b7c 100644 --- a/src/core/controllers/AutoCompleteController.php +++ b/src/core/controllers/AutoCompleteController.php @@ -60,13 +60,13 @@ class AutoCompleteController 'select' => ['DISTINCT users.user_id', 'users.firstname', 'users.lastname'], 'entities' => $entities ]); - $usersNoEntities = UserEntityModel::getUsersWithoutEntities(['select' => ['users.id', 'user_id', 'users.firstname', 'users.lastname']]); + $usersNoEntities = UserEntityModel::getUsersWithoutEntities(['select' => ['users.id', 'users.user_id', 'users.firstname', 'users.lastname']]); $users = array_merge($users, $usersNoEntities); } else { $excludedUsers = ['superadmin']; $users = UserModel::get([ - 'select' => ['users.id', 'user_id', 'firstname', 'lastname'], + 'select' => ['id', 'user_id', 'firstname', 'lastname'], 'where' => ['enabled = ?', 'status != ?', 'user_id not in (?)'], 'data' => ['Y', 'DEL', $excludedUsers], 'orderBy' => ['lastname'] -- GitLab