diff --git a/lib/Db/Circle.php b/lib/Db/Circle.php index a8808c102..9887f306e 100644 --- a/lib/Db/Circle.php +++ b/lib/Db/Circle.php @@ -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 ]; diff --git a/lib/Service/PermissionService.php b/lib/Service/PermissionService.php index bef86f599..787987bf4 100644 --- a/lib/Service/PermissionService.php +++ b/lib/Service/PermissionService.php @@ -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());