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

Only map circles if the app is enabled (#1034)

Browse Source 
Only map circles if the app is enabled
This commit is contained in:
Julius Härtl
2019-05-08 13:18:03 +02:00
committed by GitHub
parent c118de2165 47e3aad1b7
commit 8688b05474
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Db/BoardMapper.php
View File

@@ -26,6 +26,7 @@ namespace OCA\Deck\Db;
use OCP\AppFramework\Db\DoesNotExistException; use OCP\AppFramework\Db\DoesNotExistException;
use OCP\AppFramework\QueryException; use OCP\AppFramework\QueryException;
use OCP\IDBConnection; use OCP\IDBConnection;
use OCP\ILogger;
use OCP\IUserManager; use OCP\IUserManager;
use OCP\IGroupManager; use OCP\IGroupManager;
@@ -234,7 +235,7 @@ class BoardMapper extends DeckMapper implements IPermissionMapper {
\OC::$server->getLogger()->debug('Group ' . $acl->getId() . ' not found when mapping acl ' . $acl->getParticipant()); \OC::$server->getLogger()->debug('Group ' . $acl->getId() . ' not found when mapping acl ' . $acl->getParticipant());
return null; return null;
} }
if ($acl->getType() === Acl::PERMISSION_TYPE_CIRCLE) { if ($acl->getType() === Acl::PERMISSION_TYPE_CIRCLE && $this->circlesEnabled) {
try { try {
$circle = \OCA\Circles\Api\v1\Circles::detailsCircle($acl->getParticipant(), true); $circle = \OCA\Circles\Api\v1\Circles::detailsCircle($acl->getParticipant(), true);
if ($circle) { if ($circle) {
@@ -244,7 +245,8 @@ class BoardMapper extends DeckMapper implements IPermissionMapper {
} }
return null; return null;
} }
throw new \Exception('Unknown permission type for mapping Acl'); \OC::$server->getLogger()->log(ILogger::WARN, 'Unknown permission type for mapping acl ' . $acl->getId());
return null;
}); });
} }