Require 16 for collections

Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2019-03-19 22:56:11 +01:00
parent e2be00a18d
commit 2852510b55
3 changed files with 21 additions and 6 deletions

View File

@@ -75,7 +75,6 @@ class BoardService {
IGroupManager $groupManager,
ActivityManager $activityManager,
ChangeHelper $changeHelper,
ResourceProvider $resourceProvider,
$userId
) {
$this->boardMapper = $boardMapper;
@@ -90,7 +89,6 @@ class BoardService {
$this->groupManager = $groupManager;
$this->activityManager = $activityManager;
$this->changeHelper = $changeHelper;
$this->resourceProvider = $resourceProvider;
$this->userId = $userId;
}
@@ -463,7 +461,13 @@ class BoardService {
$this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_BOARD, $newAcl, ActivityManager::SUBJECT_BOARD_SHARE);
$this->boardMapper->mapAcl($newAcl);
$this->changeHelper->boardChanged($boardId);
$this->resourceProvider->invalidateAccessCache($boardId);
$version = \OC_Util::getVersion()[0];
if ($version >= 16) {
try {
$resourceProvider = \OC::$server->query(\OCA\Deck\Collaboration\Resources\ResourceProvider::class);
$resourceProvider->invalidateAccessCache($boardId);
} catch (\Exception $e) {}
}
return $newAcl;
}
@@ -534,7 +538,13 @@ class BoardService {
}
$this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_BOARD, $acl, ActivityManager::SUBJECT_BOARD_UNSHARE);
$this->changeHelper->boardChanged($acl->getBoardId());
$this->resourceProvider->invalidateAccessCache($acl->getBoardId());
$version = \OC_Util::getVersion()[0];
if ($version >= 16) {
try {
$resourceProvider = \OC::$server->query(\OCA\Deck\Collaboration\Resources\ResourceProvider::class);
$resourceProvider->invalidateAccessCache($acl->getBoardId());
} catch (\Exception $e) {}
}
return $this->aclMapper->delete($acl);
}