upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-03 20:41:22 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Merge 2193f842e8 into d09b8c99de

Browse source
This commit is contained in:
Kent Delante 2026-02-03 19:58:11 -01:00 committed by GitHub
commit 5ec3c3afbf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/provisioning_api/lib/Controller/GroupsController.php
View file

@ -156,7 +156,6 @@ class GroupsController extends AUserDataOCSController {
$group = $this->groupManager->get($groupId);
if ($group !== null) {
$isSubadminOfGroup = $this->groupManager->getSubAdmin()->isSubAdminOfGroup($user, $group);
$isMember = $this->groupManager->isInGroup($user->getUID(), $group->getGID());
} else {
throw new OCSNotFoundException('The requested group could not be found');
}
@ -164,6 +163,12 @@ class GroupsController extends AUserDataOCSController {
// Check subadmin has access to this group
$isAdmin = $this->groupManager->isAdmin($user->getUID());
$isDelegatedAdmin = $this->groupManager->isDelegatedAdmin($user->getUID());
$isMember = false;
if (!$isAdmin && !$isDelegatedAdmin && !$isSubadminOfGroup) {
$isMember = $this->groupManager->isInGroup($user->getUID(), $group->getGID());
}
if ($isAdmin || $isDelegatedAdmin || $isSubadminOfGroup || $isMember) {
$users = $this->groupManager->get($groupId)->getUsers();
$users = array_map(function ($user) {