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

Add compatibility for circles on 22

Browse Source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2021-06-04 12:38:28 +02:00
parent 6365d83431
commit 3e032b133d
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Db/Circle.php
View File

@@ -36,8 +36,8 @@ class Circle extends RelationalObject {
public function getObjectSerialization() {
return [
'uid' => $this->object->getUniqueId(),
'displayname' => $this->object->getName(),
'typeString' => $this->object->getTypeString(),
'displayname' => $this->object->getDisplayName(),
'typeString' => '',
'circleOwner' => $this->object->getOwner(),
'type' => 7
];

6
lib/Service/PermissionService.php
View File

@@ -268,7 +268,11 @@ class PermissionService {
continue;
}
foreach ($circle->getMembers() as $member) {
foreach ($circle->getInheritedMembers() as $member) {
if ($member->getUserType() !== 1) {
// deck currently only supports user members in circles
continue;
}
$user = $this->userManager->get($member->getUserId());
if ($user === null) {
$this->logger->info('No user found for circle member ' . $member->getUserId());