From f16ac8cd66b107f04db78a70521a959eca85159a Mon Sep 17 00:00:00 2001 From: Frederic Guillot Date: Mon, 22 May 2017 14:37:37 -0400 Subject: [PATCH] Show only active users in auto-complete forms --- ChangeLog | 1 + app/Controller/UserAjaxController.php | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d05f5f667..478476ba0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ Bug fixes: * Ensure project tags are removed when the project is removed * Avoid PHP notice when regenerating API token for a user * Fix wrong dropdown menu in group members list +* Show only active users in auto-complete forms (project permissions) Version 1.0.43 (April 30, 2017) ------------------------------- diff --git a/app/Controller/UserAjaxController.php b/app/Controller/UserAjaxController.php index 17567a00e..37c09b8a7 100644 --- a/app/Controller/UserAjaxController.php +++ b/app/Controller/UserAjaxController.php @@ -22,7 +22,11 @@ class UserAjaxController extends BaseController { $search = $this->request->getStringParam('term'); $filter = $this->userQuery->withFilter(new UserNameFilter($search)); - $filter->getQuery()->asc(UserModel::TABLE.'.name')->asc(UserModel::TABLE.'.username'); + $filter->getQuery() + ->eq(UserModel::TABLE.'.is_active', 1) + ->asc(UserModel::TABLE.'.name') + ->asc(UserModel::TABLE.'.username'); + $this->response->json($filter->format($this->userAutoCompleteFormatter)); }