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

Circles 22

Author: juliusknorr

lib/Db/Circle.php

@@ -36,8 +36,8 @@ public function __construct(\OCA\Circles\Model\Circle $circle) {
 	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
 		];

lib/Service/PermissionService.php

@@ -268,7 +268,11 @@ public function findUsers($boardId, $refresh = false) {
 						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());