diff --git a/lib/Controller/BoardController.php b/lib/Controller/BoardController.php index 774bfbe91..a3be7845d 100644 --- a/lib/Controller/BoardController.php +++ b/lib/Controller/BoardController.php @@ -23,6 +23,7 @@ namespace OCA\Deck\Controller; +use OCA\Deck\Db\Acl; use OCA\Deck\Service\BoardService; use OCA\Deck\Service\PermissionService; use OCP\IRequest; @@ -123,7 +124,13 @@ class BoardController extends Controller { * @internal param $userId */ public function getUserPermissions($boardId) { - return $this->permissionService->getPermissions($boardId); + $permissions = $this->permissionService->getPermissions($boardId); + return [ + 'PERMISSION_READ' => $permissions[Acl::PERMISSION_READ], + 'PERMISSION_EDIT' => $permissions[Acl::PERMISSION_EDIT], + 'PERMISSION_MANAGE' => $permissions[Acl::PERMISSION_MANAGE], + 'PERMISSION_SHARE' => $permissions[Acl::PERMISSION_SHARE] + ]; } /** diff --git a/lib/Service/PermissionService.php b/lib/Service/PermissionService.php index 307d396a8..ae0f63954 100644 --- a/lib/Service/PermissionService.php +++ b/lib/Service/PermissionService.php @@ -63,7 +63,7 @@ class PermissionService { $acls = $this->aclMapper->findAll($boardId); return [ Acl::PERMISSION_READ => $owner || $this->userCan($acls, Acl::PERMISSION_READ), - Acl::PERMISSION_EDIT => $owner || $this->userCan($acls, Acl::PERMISSION_READ), + Acl::PERMISSION_EDIT => $owner || $this->userCan($acls, Acl::PERMISSION_EDIT), Acl::PERMISSION_MANAGE => $owner || $this->userCan($acls, Acl::PERMISSION_MANAGE), Acl::PERMISSION_SHARE => $owner || $this->userCan($acls, Acl::PERMISSION_SHARE), ]; diff --git a/tests/unit/controller/BoardControllerTest.php b/tests/unit/controller/BoardControllerTest.php index 156f6e9ae..66b56ca74 100644 --- a/tests/unit/controller/BoardControllerTest.php +++ b/tests/unit/controller/BoardControllerTest.php @@ -121,6 +121,12 @@ class BoardControllerTest extends \PHPUnit_Framework_TestCase { } public function testGetUserPermissions() { + $acl = [ + Acl::PERMISSION_READ => true, + Acl::PERMISSION_EDIT => true, + Acl::PERMISSION_MANAGE => true, + Acl::PERMISSION_SHARE => true, + ]; $expected = [ 'PERMISSION_READ' => true, 'PERMISSION_EDIT' => true, @@ -130,7 +136,7 @@ class BoardControllerTest extends \PHPUnit_Framework_TestCase { $this->permissionService->expects($this->once()) ->method('getPermissions') ->with(123) - ->willReturn($expected); + ->willReturn($acl); $this->assertEquals($expected, $this->controller->getUserPermissions(123)); }