diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-11-14 17:32:03 +0100 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2017-11-14 17:32:03 +0100 |
| commit | eb0f3ebf752f07f5dd721b8927514588b8428fc3 (patch) | |
| tree | 0b2a83cebf62bf031f7bc2f86a0465680fc363c5 | |
| parent | 6d1d2dde0b56b8cc16855599628493bd5cfc9c4d (diff) | |
| download | nextcloud-server-eb0f3ebf752f07f5dd721b8927514588b8428fc3.tar.gz nextcloud-server-eb0f3ebf752f07f5dd721b8927514588b8428fc3.zip | |
Fix search in user managent when no group is selected
* also allows to search by displayname
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| -rw-r--r-- | lib/private/User/Database.php | 2 | ||||
| -rw-r--r-- | settings/Controller/UsersController.php | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/private/User/Database.php b/lib/private/User/Database.php index a835ca3384e..471ff1f45ae 100644 --- a/lib/private/User/Database.php +++ b/lib/private/User/Database.php @@ -290,6 +290,8 @@ class Database extends Backend implements IUserBackend { if ($search !== '') { $parameters[] = '%' . \OC::$server->getDatabaseConnection()->escapeLikeParameter($search) . '%'; $searchLike = ' WHERE LOWER(`uid`) LIKE LOWER(?)'; + $parameters[] = '%' . \OC::$server->getDatabaseConnection()->escapeLikeParameter($search) . '%'; + $searchLike .= ' OR LOWER(`displayname`) LIKE LOWER(?)'; } $query = \OC_DB::prepare('SELECT `uid` FROM `*PREFIX*users`' . $searchLike . ' ORDER BY LOWER(`uid`) ASC', $limit, $offset); diff --git a/settings/Controller/UsersController.php b/settings/Controller/UsersController.php index d583dc8690d..68c920dde17 100644 --- a/settings/Controller/UsersController.php +++ b/settings/Controller/UsersController.php @@ -308,7 +308,7 @@ class UsersController extends Controller { $userObjects = []; $users = []; if ($this->isAdmin) { - if ($gid !== '' && $gid !== '_disabledUsers') { + if ($gid !== '' && $gid !== '_disabledUsers' && $gid !== '_everyone') { $batch = $this->getUsersForUID($this->groupManager->displayNamesInGroup($gid, $pattern, $limit, $offset)); } else { $batch = $this->userManager->search($pattern, $limit, $offset); |