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

Merge pull request #3105 from nextcloud/bugfix/circles-22

Browse Source 
Circles 22
This commit is contained in:
Julius Härtl
2021-06-25 15:35:15 +02:00
committed by GitHub
parent e77041a105 3e032b133d
commit cbd14eb30a
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() { public function getObjectSerialization() {
return [ return [
'uid' => $this->object->getUniqueId(), 'uid' => $this->object->getUniqueId(),
'displayname' => $this->object->getName(), 'displayname' => $this->object->getDisplayName(),
'typeString' => $this->object->getTypeString(), 'typeString' => '',
'circleOwner' => $this->object->getOwner(), 'circleOwner' => $this->object->getOwner(),
'type' => 7 'type' => 7
]; ];

6
lib/Service/PermissionService.php
View File

@@ -268,7 +268,11 @@ class PermissionService {
continue; 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()); $user = $this->userManager->get($member->getUserId());
if ($user === null) { if ($user === null) {
$this->logger->info('No user found for circle member ' . $member->getUserId()); $this->logger->info('No user found for circle member ' . $member->getUserId());