mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7169 from nextcloud/fix-user-search 

Fix search in user managent when no group is selected
This commit is contained in:
Morris Jobke 2017-11-14 23:30:02 +01:00 committed by GitHub
parent 80e527d21e eb0f3ebf75
commit 82502b10db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/private/User/Database.php
View File

@ -290,6 +290,8 @@ class Database extends Backend implements IUserBackend {
if ($search !== '') { if ($search !== '') {
$parameters[] = '%' . \OC::$server->getDatabaseConnection()->escapeLikeParameter($search) . '%'; $parameters[] = '%' . \OC::$server->getDatabaseConnection()->escapeLikeParameter($search) . '%';
$searchLike = ' WHERE LOWER(`uid`) LIKE LOWER(?)'; $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); $query = \OC_DB::prepare('SELECT `uid` FROM `*PREFIX*users`' . $searchLike . ' ORDER BY LOWER(`uid`) ASC', $limit, $offset);

2
settings/Controller/UsersController.php
View File

@ -308,7 +308,7 @@ class UsersController extends Controller {
$userObjects = []; $userObjects = [];
$users = []; $users = [];
if ($this->isAdmin) { if ($this->isAdmin) {
if ($gid !== '' && $gid !== '_disabledUsers') { if ($gid !== '' && $gid !== '_disabledUsers' && $gid !== '_everyone') {
$batch = $this->getUsersForUID($this->groupManager->displayNamesInGroup($gid, $pattern, $limit, $offset)); $batch = $this->getUsersForUID($this->groupManager->displayNamesInGroup($gid, $pattern, $limit, $offset));
} else { } else {
$batch = $this->userManager->search($pattern, $limit, $offset); $batch = $this->userManager->search($pattern, $limit, $offset);