ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/vue' into master-merge-vue

Browse Source
This commit is contained in:
Julius Härtl
2020-01-25 10:42:05 +01:00
parent 1a84e99fba 081e791d37
commit 61e4d807b7
137 changed files with 27543 additions and 17157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/Service/PermissionService.php
View File

@@ -262,6 +262,27 @@ class PermissionService {
$users[$user->getUID()] = new User($user);
}
}
if ($this->circlesEnabled && $acl->getType() === Acl::PERMISSION_TYPE_CIRCLE) {
try {
$circle = \OCA\Circles\Api\v1\Circles::detailsCircle($acl->getParticipant(), true);
if ($circle === null) {
$this->logger->info('No circle found for acl rule ' . $acl->getId());
continue;
}
foreach ($circle->getMembers() as $member) {
$user = $this->userManager->get($member->getUserId());
if ($user === null) {
$this->logger->info('No user found for circle member ' . $member->getUserId());
} else {
$users[$member->getUserId()] = new User($user);
}
}
} catch (\Exception $e) {
$this->logger->info('Member not found in circle that was accessed. This should not happen.');
}
}
}
$this->users[(string) $boardId] = $users;
return $this->users[(string) $boardId];