From cc2d58a850f9a8336344d00be8ac82e3e33b78ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Fri, 15 Jun 2018 22:52:30 +0200 Subject: [PATCH] Keep userids as keys on group search MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- apps/provisioning_api/lib/Controller/GroupsController.php | 7 ++++--- lib/private/Group/Group.php | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/apps/provisioning_api/lib/Controller/GroupsController.php b/apps/provisioning_api/lib/Controller/GroupsController.php index 5114c6f01d5..765a7ea48e8 100644 --- a/apps/provisioning_api/lib/Controller/GroupsController.php +++ b/apps/provisioning_api/lib/Controller/GroupsController.php @@ -177,12 +177,13 @@ class GroupsController extends AUserData { * @NoAdminRequired * * @param string $groupId + * @param string $search * @param int $limit * @param int $offset * @return DataResponse * @throws OCSException */ - public function getGroupUsersDetails(string $groupId, int $limit = null, int $offset = 0): DataResponse { + public function getGroupUsersDetails(string $groupId, string $search = '', int $limit = null, int $offset = 0): DataResponse { $user = $this->userSession->getUser(); $isSubadminOfGroup = false; @@ -197,9 +198,9 @@ class GroupsController extends AUserData { // Check subadmin has access to this group if($this->groupManager->isAdmin($user->getUID()) || $isSubadminOfGroup) { - $users = $this->groupManager->get($groupId)->getUsers(); + $users = $this->groupManager->get($groupId)->searchUsers($search, $limit, $offset); + // Extract required number - $users = array_slice($users, $offset, $limit); $users = array_keys($users); $usersDetails = []; foreach ($users as $userId) { diff --git a/lib/private/Group/Group.php b/lib/private/Group/Group.php index cc6315263d4..275b697bc3b 100644 --- a/lib/private/Group/Group.php +++ b/lib/private/Group/Group.php @@ -211,10 +211,10 @@ class Group implements IGroup { $userIds = $backend->usersInGroup($this->gid, $search, $limit, $offset); $users += $this->getVerifiedUsers($userIds); if (!is_null($limit) and $limit <= 0) { - return array_values($users); + return $users; } } - return array_values($users); + return $users; } /**