diff --git a/appinfo/database.xml b/appinfo/database.xml index 65b367818..731aea98a 100644 --- a/appinfo/database.xml +++ b/appinfo/database.xml @@ -331,12 +331,12 @@ 64 - permission_write + permission_edit boolean false - permission_invite + permission_share boolean false diff --git a/lib/Controller/BoardController.php b/lib/Controller/BoardController.php index 901b8e0af..f406e8ef6 100644 --- a/lib/Controller/BoardController.php +++ b/lib/Controller/BoardController.php @@ -130,25 +130,25 @@ class BoardController extends Controller { * @param $boardId * @param $type * @param $participant - * @param $write - * @param $invite + * @param $edit + * @param $share * @param $manage * @return \OCP\AppFramework\Db\Entity */ - public function addAcl($boardId, $type, $participant, $write, $invite, $manage) { - return $this->boardService->addAcl($boardId, $type, $participant, $write, $invite, $manage); + public function addAcl($boardId, $type, $participant, $edit, $share, $manage) { + return $this->boardService->addAcl($boardId, $type, $participant, $edit, $share, $manage); } /** * @NoAdminRequired * @param $id - * @param $permissionWrite - * @param $permissionInvite + * @param $permissionEdit + * @param $permissionShare * @param $permissionManage * @return \OCP\AppFramework\Db\Entity */ - public function updateAcl($id, $permissionWrite, $permissionInvite, $permissionManage) { - return $this->boardService->updateAcl($id, $permissionWrite, $permissionInvite, $permissionManage); + public function updateAcl($id, $permissionEdit, $permissionShare, $permissionManage) { + return $this->boardService->updateAcl($id, $permissionEdit, $permissionShare, $permissionManage); } /** diff --git a/lib/Controller/ShareController.php b/lib/Controller/ShareController.php index 91da7a48c..58f2e5624 100644 --- a/lib/Controller/ShareController.php +++ b/lib/Controller/ShareController.php @@ -60,8 +60,8 @@ class ShareController extends Controller { $acl = new Acl(); $acl->setType('group'); $acl->setParticipant($group->getGID()); - $acl->setPermissionWrite(true); - $acl->setPermissionInvite(true); + $acl->setPermissionEdit(true); + $acl->setPermissionShare(true); $acl->setPermissionManage(true); $result[] = $acl; } @@ -72,8 +72,8 @@ class ShareController extends Controller { $acl = new Acl(); $acl->setType('user'); $acl->setParticipant($user->getUID()); - $acl->setPermissionWrite(true); - $acl->setPermissionInvite(true); + $acl->setPermissionEdit(true); + $acl->setPermissionShare(true); $acl->setPermissionManage(true); $result[] = $acl; } diff --git a/lib/Db/Acl.php b/lib/Db/Acl.php index 3707f8ae2..634eb436b 100644 --- a/lib/Db/Acl.php +++ b/lib/Db/Acl.php @@ -34,21 +34,21 @@ class Acl extends Entity implements \JsonSerializable { protected $participant; protected $type; protected $boardId; - protected $permissionWrite; - protected $permissionInvite; + protected $permissionEdit; + protected $permissionShare; protected $permissionManage; protected $owner; public function __construct() { $this->addType('id','integer'); $this->addType('boardId','integer'); - $this->addType('permissionWrite', 'boolean'); - $this->addType('permissionInvite', 'boolean'); + $this->addType('permissionEdit', 'boolean'); + $this->addType('permissionShare', 'boolean'); $this->addType('permissionManage', 'boolean'); $this->addType('owner', 'boolean'); $this->addRelation('owner'); - $this->setPermissionWrite(false); - $this->setPermissionInvite(false); + $this->setPermissionEdit(false); + $this->setPermissionShare(false); $this->setPermissionManage(false); } @@ -57,9 +57,9 @@ class Acl extends Entity implements \JsonSerializable { case Acl::PERMISSION_READ: return true; case Acl::PERMISSION_EDIT: - return $this->getPermissionWrite(); + return $this->getPermissionEdit(); case Acl::PERMISSION_SHARE: - return $this->getPermissionInvite(); + return $this->getPermissionShare(); case Acl::PERMISSION_MANAGE: return $this->getPermissionManage(); } @@ -72,8 +72,8 @@ class Acl extends Entity implements \JsonSerializable { 'participant' => $this->participant, 'type' => $this->type, 'boardId' => $this->boardId, - 'permissionWrite' => $this->permissionWrite, - 'permissionInvite' => $this->permissionInvite, + 'permissionEdit' => $this->permissionEdit, + 'permissionShare' => $this->permissionShare, 'permissionManage' => $this->permissionManage, 'owner' => $this->owner ]; diff --git a/lib/Db/AclMapper.php b/lib/Db/AclMapper.php index 5791307c6..c67e5797b 100644 --- a/lib/Db/AclMapper.php +++ b/lib/Db/AclMapper.php @@ -33,7 +33,7 @@ class AclMapper extends DeckMapper implements IPermissionMapper { } public function findAll($boardId, $limit=null, $offset=null) { - $sql = 'SELECT id, board_id, type, participant, permission_write, permission_invite, permission_manage FROM `*PREFIX*deck_board_acl` WHERE `board_id` = ? '; + $sql = 'SELECT id, board_id, type, participant, permission_edit, permission_share, permission_manage FROM `*PREFIX*deck_board_acl` WHERE `board_id` = ? '; return $this->findEntities($sql, [$boardId], $limit, $offset); } diff --git a/lib/Db/Stack.php b/lib/Db/Stack.php index 0892f7151..f987e5df5 100644 --- a/lib/Db/Stack.php +++ b/lib/Db/Stack.php @@ -5,20 +5,20 @@ * @author Julius Härtl * * @license GNU AGPL version 3 or any later version - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Affero General Public License for more details. - * + * * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . - * + * */ namespace OCA\Deck\Db; @@ -35,9 +35,9 @@ class Stack extends Entity implements JsonSerializable { protected $order; public function __construct() { - $this->addType('id','integer'); - $this->addType('boardId','integer'); - $this->addType('order','integer'); + $this->addType('id', 'integer'); + $this->addType('boardId', 'integer'); + $this->addType('order', 'integer'); } public function setCards($cards) { @@ -45,22 +45,20 @@ class Stack extends Entity implements JsonSerializable { } public function jsonSerialize() { - if(!empty($this->cards)) { - return [ - 'id' => $this->id, - 'title' => $this->title, - 'order' => $this->order, - 'boardId' => $this->boardId, - 'cards' => $this->cards - ]; - } else { - return [ - 'id' => $this->id, - 'title' => $this->title, - 'order' => $this->order, - 'boardId' => $this->boardId - ]; - } - + if (!empty($this->cards)) { + return [ + 'id' => $this->id, + 'title' => $this->title, + 'order' => $this->order, + 'boardId' => $this->boardId, + 'cards' => $this->cards + ]; + } + return [ + 'id' => $this->id, + 'title' => $this->title, + 'order' => $this->order, + 'boardId' => $this->boardId + ]; } } \ No newline at end of file diff --git a/lib/Service/BoardService.php b/lib/Service/BoardService.php index 4bcbdd25e..a8f5fb0f3 100644 --- a/lib/Service/BoardService.php +++ b/lib/Service/BoardService.php @@ -104,23 +104,23 @@ class BoardService { } - public function addAcl($boardId, $type, $participant, $write, $invite, $manage) { + public function addAcl($boardId, $type, $participant, $edit, $share, $manage) { $this->permissionService->checkPermission($this->boardMapper, $boardId, Acl::PERMISSION_SHARE); $acl = new Acl(); $acl->setBoardId($boardId); $acl->setType($type); $acl->setParticipant($participant); - $acl->setPermissionWrite($write); - $acl->setPermissionInvite($invite); + $acl->setPermissionEdit($edit); + $acl->setPermissionShare($share); $acl->setPermissionManage($manage); return $this->aclMapper->insert($acl); } - public function updateAcl($id, $write, $invite, $manage) { + public function updateAcl($id, $edit, $share, $manage) { $this->permissionService->checkPermission($this->boardMapper, $id, Acl::PERMISSION_SHARE); $acl = $this->aclMapper->find($id); - $acl->setPermissionWrite($write); - $acl->setPermissionInvite($invite); + $acl->setPermissionEdit($edit); + $acl->setPermissionShare($share); $acl->setPermissionManage($manage); return $this->aclMapper->update($acl); } diff --git a/templates/part.board.sidebarView.php b/templates/part.board.sidebarView.php index 87551d1ab..18c8c1f41 100644 --- a/templates/part.board.sidebarView.php +++ b/templates/part.board.sidebarView.php @@ -46,11 +46,11 @@ {{ acl.participant }} - + - + diff --git a/tests/unit/Db/AclMapperTest.php b/tests/unit/Db/AclMapperTest.php index 071f2872e..76c307301 100644 --- a/tests/unit/Db/AclMapperTest.php +++ b/tests/unit/Db/AclMapperTest.php @@ -66,12 +66,12 @@ class AclMapperTest extends MapperTestUtility { } } /** @return Acl */ - public function getAcl($type='user', $participant='admin', $write=false, $invite=false, $manage=false, $boardId=123) { + public function getAcl($type='user', $participant='admin', $edit=false, $share=false, $manage=false, $boardId=123) { $acl = new Acl(); $acl->setParticipant($participant); $acl->setType('user'); - $acl->setPermissionWrite($write); - $acl->setPermissionInvite($invite); + $acl->setPermissionEdit($edit); + $acl->setPermissionShare($share); $acl->setPermissionManage($manage); $acl->setBoardId($boardId); return $acl; diff --git a/tests/unit/Db/AclTest.php b/tests/unit/Db/AclTest.php index c83cd98a5..200cb208e 100644 --- a/tests/unit/Db/AclTest.php +++ b/tests/unit/Db/AclTest.php @@ -30,8 +30,8 @@ class AclTest extends \PHPUnit_Framework_TestCase { $acl->setParticipant("admin"); $acl->setType("user"); $acl->setBoardId(1); - $acl->setPermissionWrite(1); - $acl->setPermissionInvite(1); + $acl->setPermissionEdit(1); + $acl->setPermissionShare(1); $acl->setPermissionManage(1); return $acl; } @@ -41,8 +41,8 @@ class AclTest extends \PHPUnit_Framework_TestCase { $acl->setParticipant("administrators"); $acl->setType("group"); $acl->setBoardId(1); - $acl->setPermissionWrite(1); - $acl->setPermissionInvite(1); + $acl->setPermissionEdit(1); + $acl->setPermissionShare(1); $acl->setPermissionManage(1); return $acl; } @@ -53,8 +53,8 @@ class AclTest extends \PHPUnit_Framework_TestCase { 'participant' => 'admin', 'type' => 'user', 'boardId' => 1, - 'permissionWrite' => 1, - 'permissionInvite' => 1, + 'permissionEdit' => 1, + 'permissionShare' => 1, 'permissionManage' => 1, 'owner' => 0 ], $acl->jsonSerialize()); @@ -64,8 +64,8 @@ class AclTest extends \PHPUnit_Framework_TestCase { 'participant' => 'administrators', 'type' => 'group', 'boardId' => 1, - 'permissionWrite' => 1, - 'permissionInvite' => 1, + 'permissionEdit' => 1, + 'permissionShare' => 1, 'permissionManage' => 1, 'owner' => 0 ], $acl->jsonSerialize()); @@ -78,8 +78,8 @@ class AclTest extends \PHPUnit_Framework_TestCase { 'participant' => 'admin', 'type' => 'user', 'boardId' => 1, - 'permissionWrite' => 1, - 'permissionInvite' => 1, + 'permissionEdit' => 1, + 'permissionShare' => 1, 'permissionManage' => 1, 'owner' => 1 ], $acl->jsonSerialize()); @@ -92,8 +92,8 @@ class AclTest extends \PHPUnit_Framework_TestCase { $this->assertEquals(true, $acl->getPermission(Acl::PERMISSION_EDIT)); $this->assertEquals(true, $acl->getPermission(Acl::PERMISSION_MANAGE)); $this->assertEquals(true, $acl->getPermission(Acl::PERMISSION_SHARE)); - $acl->setPermissionWrite(0); - $acl->setPermissionInvite(0); + $acl->setPermissionEdit(0); + $acl->setPermissionShare(0); $acl->setPermissionManage(0); $this->assertEquals(true, $acl->getPermission(Acl::PERMISSION_READ)); $this->assertEquals(false, $acl->getPermission(Acl::PERMISSION_EDIT)); diff --git a/tests/unit/Db/BoardMapperTest.php b/tests/unit/Db/BoardMapperTest.php index 29aa7fa8f..b186c0e3b 100644 --- a/tests/unit/Db/BoardMapperTest.php +++ b/tests/unit/Db/BoardMapperTest.php @@ -71,12 +71,12 @@ class BoardMapperTest extends MapperTestUtility { } } /** @return Acl */ - public function getAcl($type='user', $participant='admin', $write=false, $invite=false, $manage=false, $boardId=123) { + public function getAcl($type='user', $participant='admin', $edit=false, $share=false, $manage=false, $boardId=123) { $acl = new Acl(); $acl->setParticipant($participant); $acl->setType('user'); - $acl->setPermissionWrite($write); - $acl->setPermissionInvite($invite); + $acl->setPermissionEdit($edit); + $acl->setPermissionShare($share); $acl->setPermissionManage($manage); $acl->setBoardId($boardId); return $acl; diff --git a/tests/unit/Service/BoardServiceTest.php b/tests/unit/Service/BoardServiceTest.php index ff188e6c7..4330bc31d 100644 --- a/tests/unit/Service/BoardServiceTest.php +++ b/tests/unit/Service/BoardServiceTest.php @@ -144,8 +144,8 @@ class BoardServiceTest extends \PHPUnit_Framework_TestCase { $acl->setBoardId(123); $acl->setType('user'); $acl->setParticipant('admin'); - $acl->setPermissionWrite(true); - $acl->setPermissionInvite(true); + $acl->setPermissionEdit(true); + $acl->setPermissionShare(true); $acl->setPermissionManage(true); $this->aclMapper->expects($this->once()) ->method('insert') @@ -161,8 +161,8 @@ class BoardServiceTest extends \PHPUnit_Framework_TestCase { $acl->setBoardId(123); $acl->setType('user'); $acl->setParticipant('admin'); - $acl->setPermissionWrite(true); - $acl->setPermissionInvite(true); + $acl->setPermissionEdit(true); + $acl->setPermissionShare(true); $acl->setPermissionManage(true); $this->aclMapper->expects($this->once()) @@ -178,8 +178,8 @@ class BoardServiceTest extends \PHPUnit_Framework_TestCase { 123, false, false, false ); - $this->assertFalse($result->getPermissionWrite()); - $this->assertFalse($result->getPermissionInvite()); + $this->assertFalse($result->getPermissionEdit()); + $this->assertFalse($result->getPermissionShare()); $this->assertFalse($result->getPermissionManage()); } @@ -189,8 +189,8 @@ class BoardServiceTest extends \PHPUnit_Framework_TestCase { $acl->setBoardId(123); $acl->setType('user'); $acl->setParticipant('admin'); - $acl->setPermissionWrite(true); - $acl->setPermissionInvite(true); + $acl->setPermissionEdit(true); + $acl->setPermissionShare(true); $acl->setPermissionManage(true); $this->aclMapper->expects($this->once()) ->method('find') diff --git a/tests/unit/Service/PermissionServiceTest.php b/tests/unit/Service/PermissionServiceTest.php index f42cfcc6f..15ce8d6cd 100644 --- a/tests/unit/Service/PermissionServiceTest.php +++ b/tests/unit/Service/PermissionServiceTest.php @@ -88,8 +88,8 @@ class PermissionServiceTest extends \PHPUnit_Framework_TestCase { $aclUser = new Acl(); $aclUser->setType('user'); $aclUser->setParticipant('admin'); - $aclUser->setPermissionWrite(true); - $aclUser->setPermissionInvite(true); + $aclUser->setPermissionEdit(true); + $aclUser->setPermissionShare(true); $aclUser->setPermissionManage(true); $this->aclMapper->expects($this->once()) ->method('findAll') @@ -150,8 +150,8 @@ class PermissionServiceTest extends \PHPUnit_Framework_TestCase { $aclUser = new Acl(); $aclUser->setType($type); $aclUser->setParticipant($participant); - $aclUser->setPermissionWrite($edit); - $aclUser->setPermissionInvite($share); + $aclUser->setPermissionEdit($edit); + $aclUser->setPermissionShare($share); $aclUser->setPermissionManage($manage); $acls = [ $aclUser @@ -257,13 +257,13 @@ class PermissionServiceTest extends \PHPUnit_Framework_TestCase { $this->service->checkPermission($mapper, 1234, Acl::PERMISSION_READ); } - private function generateAcl($boardId, $type, $participant, $write, $manage, $share) { + private function generateAcl($boardId, $type, $participant, $edit, $manage, $share) { $acl = new Acl(); $acl->setParticipant($participant); $acl->setBoardId($boardId); $acl->setType($type); - $acl->setPermissionWrite($write); - $acl->setPermissionInvite($share); + $acl->setPermissionEdit($edit); + $acl->setPermissionShare($share); $acl->setPermissionManage($manage); return $acl; } diff --git a/tests/unit/controller/CardControllerTest.php b/tests/unit/controller/CardControllerTest.php index e50d94345..8ac88d2a8 100644 --- a/tests/unit/controller/CardControllerTest.php +++ b/tests/unit/controller/CardControllerTest.php @@ -108,7 +108,7 @@ class CardControllerTest extends \PHPUnit_Framework_TestCase { $this->cardService->expects($this->once())->method('reorder'); $this->controller->reorder(1, 2, 3); } - + public function testRename() { $this->cardService->expects($this->once())->method('rename'); $this->controller->rename(1, 'test'); diff --git a/tests/unit/controller/ShareControllerTest.php b/tests/unit/controller/ShareControllerTest.php index 54b0d9ff1..b350d726b 100644 --- a/tests/unit/controller/ShareControllerTest.php +++ b/tests/unit/controller/ShareControllerTest.php @@ -96,8 +96,8 @@ class ShareControllerTest extends \PHPUnit_Framework_TestCase { $acl = new Acl(); $acl->setType('group'); $acl->setParticipant('foo'); - $acl->setPermissionWrite(true); - $acl->setPermissionInvite(true); + $acl->setPermissionEdit(true); + $acl->setPermissionShare(true); $acl->setPermissionManage(true); $this->assertEquals([$acl], $actual); } @@ -122,8 +122,8 @@ class ShareControllerTest extends \PHPUnit_Framework_TestCase { $acl = new Acl(); $acl->setType('user'); $acl->setParticipant('foo'); - $acl->setPermissionWrite(true); - $acl->setPermissionInvite(true); + $acl->setPermissionEdit(true); + $acl->setPermissionShare(true); $acl->setPermissionManage(true); $this->assertEquals([$acl], $actual); }