diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 3fe8043..10c6d1a 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -116,9 +116,9 @@ final class BackendController extends Controller $accountId = $request->header->account; - if ($board->createdBy->getId() !== $accountId + if ($board->createdBy->id !== $accountId && !$this->app->accountManager->get($accountId)->hasPermission( - PermissionType::READ, $this->app->unitId, $this->app->appId, self::NAME, PermissionCategory::BOARD, $board->getId()) + PermissionType::READ, $this->app->unitId, $this->app->appId, self::NAME, PermissionCategory::BOARD, $board->id) ) { $view->setTemplate('/Web/Backend/Error/403_inline'); $response->header->status = RequestStatusCode::R_403; @@ -227,9 +227,9 @@ final class BackendController extends Controller $accountId = $request->header->account; - if ($card->createdBy->getId() !== $accountId + if ($card->createdBy->id !== $accountId && !$this->app->accountManager->get($accountId)->hasPermission( - PermissionType::READ, $this->app->unitId, $this->app->appId, self::NAME, PermissionCategory::CARD, $card->getId()) + PermissionType::READ, $this->app->unitId, $this->app->appId, self::NAME, PermissionCategory::CARD, $card->id) ) { $view->setTemplate('/Web/Backend/Error/403_inline'); $response->header->status = RequestStatusCode::R_403; diff --git a/Models/KanbanBoard.php b/Models/KanbanBoard.php index c32b1dc..6bd27cd 100755 --- a/Models/KanbanBoard.php +++ b/Models/KanbanBoard.php @@ -35,7 +35,7 @@ class KanbanBoard implements \JsonSerializable * @var int * @since 1.0.0 */ - protected int $id = 0; + public int $id = 0; /** * Name. @@ -59,7 +59,7 @@ class KanbanBoard implements \JsonSerializable * @var int * @since 1.0.0 */ - private int $status = BoardStatus::ACTIVE; + public int $status = BoardStatus::ACTIVE; /** * Order. diff --git a/Models/KanbanCard.php b/Models/KanbanCard.php index eb01d31..64296b5 100755 --- a/Models/KanbanCard.php +++ b/Models/KanbanCard.php @@ -37,7 +37,7 @@ class KanbanCard implements \JsonSerializable * @var int * @since 1.0.0 */ - protected int $id = 0; + public int $id = 0; /** * Name. @@ -53,7 +53,7 @@ class KanbanCard implements \JsonSerializable * @var int * @since 1.0.0 */ - private int $status = CardStatus::ACTIVE; + public int $status = CardStatus::ACTIVE; /** * Card type. @@ -61,7 +61,7 @@ class KanbanCard implements \JsonSerializable * @var int * @since 1.0.0 */ - private int $type = CardType::TEXT; + public int $type = CardType::TEXT; /** * Color schme. @@ -400,7 +400,7 @@ class KanbanCard implements \JsonSerializable public static function createFromTask(Task $task) : self { $card = new self(); - $card->ref = $task->getId(); + $card->ref = $task->id; return $card; } diff --git a/Models/KanbanCardComment.php b/Models/KanbanCardComment.php index b999b4b..58d6f1c 100755 --- a/Models/KanbanCardComment.php +++ b/Models/KanbanCardComment.php @@ -34,7 +34,7 @@ class KanbanCardComment implements \JsonSerializable * @var int * @since 1.0.0 */ - protected int $id = 0; + public int $id = 0; /** * Description. diff --git a/Models/KanbanColumn.php b/Models/KanbanColumn.php index 5ba5cc6..56ed790 100755 --- a/Models/KanbanColumn.php +++ b/Models/KanbanColumn.php @@ -30,7 +30,7 @@ class KanbanColumn implements \JsonSerializable * @var int * @since 1.0.0 */ - protected int $id = 0; + public int $id = 0; /** * Name. diff --git a/Theme/Backend/kanban-archive.tpl.php b/Theme/Backend/kanban-archive.tpl.php index b7f921d..f748f43 100755 --- a/Theme/Backend/kanban-archive.tpl.php +++ b/Theme/Backend/kanban-archive.tpl.php @@ -18,8 +18,8 @@ use phpOMS\Uri\UriFactory; /** @var \Modules\News\Models\NewsArticle[] $boards */ $boards = $this->getData('boards') ?? []; -$previous = empty($boards) ? 'kanban/archive' : 'kanban/archive?{?}&id=' . \reset($boards)->getId() . '&ptype=p'; -$next = empty($boards) ? 'kanban/archive' : 'kanban/archive?{?}&id=' . \end($boards)->getId() . '&ptype=n'; +$previous = empty($boards) ? 'kanban/archive' : 'kanban/archive?{?}&id=' . \reset($boards)->id . '&ptype=p'; +$next = empty($boards) ? 'kanban/archive' : 'kanban/archive?{?}&id=' . \end($boards)->id . '&ptype=n'; echo $this->getData('nav')->render(); ?> @@ -72,7 +72,7 @@ echo $this->getData('nav')->render(); ?> $count = 0; foreach ($boards as $key => $board) : ++$count; - $url = UriFactory::build('{/base}/kanban/board?{?}&id=' . $board->getId()); + $url = UriFactory::build('{/base}/kanban/board?{?}&id=' . $board->id); ?> getHtml(':bStatus' . $board->getStatus()); ?> diff --git a/Theme/Backend/kanban-board.tpl.php b/Theme/Backend/kanban-board.tpl.php index b029bd6..5f17e5c 100755 --- a/Theme/Backend/kanban-board.tpl.php +++ b/Theme/Backend/kanban-board.tpl.php @@ -23,7 +23,7 @@ $columns = $board->getColumns();
printHtml($column->name); ?>
getId()); + $url = \phpOMS\Uri\UriFactory::build('kanban/card?{?}&id=' . $card->id); ?>
diff --git a/Theme/Backend/kanban-card.tpl.php b/Theme/Backend/kanban-card.tpl.php index 9eca352..0d8770d 100755 --- a/Theme/Backend/kanban-card.tpl.php +++ b/Theme/Backend/kanban-card.tpl.php @@ -35,7 +35,7 @@ $comments = $card->getComments();
getMedia(); foreach ($files as $file) : ?> - name; ?> + name; ?>
@@ -51,7 +51,7 @@ $comments = $card->getComments();
getMedia(); foreach ($files as $file) : ?> - name; ?> + name; ?>
diff --git a/Theme/Backend/kanban-dashboard.tpl.php b/Theme/Backend/kanban-dashboard.tpl.php index 0e30ec1..7bed13c 100755 --- a/Theme/Backend/kanban-dashboard.tpl.php +++ b/Theme/Backend/kanban-dashboard.tpl.php @@ -17,14 +17,14 @@ use phpOMS\Uri\UriFactory; /** @var \Modules\Kanban\Models\KanbanBoard[] $boards */ $boards = $this->getData('boards'); -$previous = empty($boards) ? 'kanban/dashboard' : 'kanban/dashboard?{?}&id=' . \reset($boards)->getId() . '&ptype=p'; -$next = empty($boards) ? 'kanban/dashboard' : 'kanban/dashboard?{?}&id=' . \end($boards)->getId() . '&ptype=n'; +$previous = empty($boards) ? 'kanban/dashboard' : 'kanban/dashboard?{?}&id=' . \reset($boards)->id . '&ptype=p'; +$next = empty($boards) ? 'kanban/dashboard' : 'kanban/dashboard?{?}&id=' . \end($boards)->id . '&ptype=n'; echo $this->getData('nav')->render(); ?>
getId()); + $url = UriFactory::build('{/base}/kanban/board?{?}&id=' . $board->id); ?>
diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php index 2b48fd2..9ea4da5 100755 --- a/tests/Controller/ApiControllerTest.php +++ b/tests/Controller/ApiControllerTest.php @@ -106,7 +106,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase $this->module->apiKanbanBoardCreate($request, $response); self::assertEquals('Controller Test Board', $response->get('')['response']->name); - self::assertGreaterThan(0, $bId = $response->get('')['response']->getId()); + self::assertGreaterThan(0, $bId = $response->get('')['response']->id); // update $response = new HttpResponse(); @@ -136,7 +136,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase $this->module->apiKanbanColumnCreate($request, $response); self::assertEquals('Controller Test Column', $response->get('')['response']->name); - self::assertGreaterThan(0, $response->get('')['response']->getId()); + self::assertGreaterThan(0, $response->get('')['response']->id); } /** @@ -173,7 +173,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase $this->module->apiKanbanCardCreate($request, $response); self::assertEquals('Controller Test Card', $response->get('')['response']->name); - self::assertGreaterThan(0, $response->get('')['response']->getId()); + self::assertGreaterThan(0, $response->get('')['response']->id); } /** @@ -206,7 +206,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase $request->setData('media', \json_encode([1])); $this->module->apiKanbanCardCommentCreate($request, $response); - self::assertGreaterThan(0, $response->get('')['response']->getId()); + self::assertGreaterThan(0, $response->get('')['response']->id); } /** diff --git a/tests/Models/KanbanBoardMapperTest.php b/tests/Models/KanbanBoardMapperTest.php index 11f9c9f..b08f840 100755 --- a/tests/Models/KanbanBoardMapperTest.php +++ b/tests/Models/KanbanBoardMapperTest.php @@ -36,14 +36,14 @@ final class KanbanBoardMapperTest extends \PHPUnit\Framework\TestCase $board->createdBy = new NullAccount(1); $id = KanbanBoardMapper::create()->execute($board); - self::assertGreaterThan(0, $board->getId()); - self::assertEquals($id, $board->getId()); + self::assertGreaterThan(0, $board->id); + self::assertEquals($id, $board->id); - $boardR = KanbanBoardMapper::get()->where('id', $board->getId())->execute(); + $boardR = KanbanBoardMapper::get()->where('id', $board->id)->execute(); self::assertEquals($board->name, $boardR->name); self::assertEquals($board->getStatus(), $boardR->getStatus()); self::assertEquals($board->description, $boardR->description); - self::assertEquals($board->createdBy->getId(), $boardR->createdBy->getId()); + self::assertEquals($board->createdBy->id, $boardR->createdBy->id); self::assertEquals($board->createdAt->format('Y-m-d'), $boardR->createdAt->format('Y-m-d')); self::assertEquals($board->getColumns(), $boardR->getColumns()); } diff --git a/tests/Models/KanbanBoardTest.php b/tests/Models/KanbanBoardTest.php index 8b0beff..9ef8b0a 100755 --- a/tests/Models/KanbanBoardTest.php +++ b/tests/Models/KanbanBoardTest.php @@ -40,11 +40,11 @@ final class KanbanBoardTest extends \PHPUnit\Framework\TestCase */ public function testDefault() : void { - self::assertEquals(0, $this->board->getId()); + self::assertEquals(0, $this->board->id); self::assertEquals(BoardStatus::ACTIVE, $this->board->getStatus()); self::assertEquals('', $this->board->name); self::assertEquals('', $this->board->description); - self::assertEquals(0, $this->board->createdBy->getId()); + self::assertEquals(0, $this->board->createdBy->id); self::assertInstanceOf('\DateTimeImmutable', $this->board->createdAt); self::assertEquals([], $this->board->getColumns()); } diff --git a/tests/Models/KanbanCardCommentMapperTest.php b/tests/Models/KanbanCardCommentMapperTest.php index d73c4f1..d280591 100755 --- a/tests/Models/KanbanCardCommentMapperTest.php +++ b/tests/Models/KanbanCardCommentMapperTest.php @@ -37,13 +37,13 @@ final class KanbanCardCommentMapperTest extends \PHPUnit\Framework\TestCase $comment->createdBy = new NullAccount(1); $id = KanbanCardCommentMapper::create()->execute($comment); - self::assertGreaterThan(0, $comment->getId()); - self::assertEquals($id, $comment->getId()); + self::assertGreaterThan(0, $comment->id); + self::assertEquals($id, $comment->id); - $commentR = KanbanCardCommentMapper::get()->where('id', $comment->getId())->execute(); + $commentR = KanbanCardCommentMapper::get()->where('id', $comment->id)->execute(); self::assertEquals($comment->description, $commentR->description); self::assertEquals($comment->card, $commentR->card); - self::assertEquals($comment->createdBy->getId(), $commentR->createdBy->getId()); + self::assertEquals($comment->createdBy->id, $commentR->createdBy->id); self::assertEquals($comment->createdAt->format('Y-m-d'), $commentR->createdAt->format('Y-m-d')); } } diff --git a/tests/Models/KanbanCardCommentTest.php b/tests/Models/KanbanCardCommentTest.php index cccf492..1f66eac 100755 --- a/tests/Models/KanbanCardCommentTest.php +++ b/tests/Models/KanbanCardCommentTest.php @@ -38,10 +38,10 @@ final class KanbanCardCommentTest extends \PHPUnit\Framework\TestCase */ public function testDefault() : void { - self::assertEquals(0, $this->comment->getId()); + self::assertEquals(0, $this->comment->id); self::assertEquals(0, $this->comment->card); self::assertEquals('', $this->comment->description); - self::assertEquals(0, $this->comment->createdBy->getId()); + self::assertEquals(0, $this->comment->createdBy->id); self::assertInstanceOf('\DateTimeImmutable', $this->comment->createdAt); self::assertEquals([], $this->comment->getMedia()); } diff --git a/tests/Models/KanbanCardMapperTest.php b/tests/Models/KanbanCardMapperTest.php index dc4e27b..2863357 100755 --- a/tests/Models/KanbanCardMapperTest.php +++ b/tests/Models/KanbanCardMapperTest.php @@ -46,17 +46,17 @@ final class KanbanCardMapperTest extends \PHPUnit\Framework\TestCase $card->addTag(new Tag()); $id = KanbanCardMapper::create()->execute($card); - self::assertGreaterThan(0, $card->getId()); - self::assertEquals($id, $card->getId()); + self::assertGreaterThan(0, $card->id); + self::assertEquals($id, $card->id); - $cardR = KanbanCardMapper::get()->where('id', $card->getId())->execute(); + $cardR = KanbanCardMapper::get()->where('id', $card->id)->execute(); self::assertEquals($card->name, $cardR->name); self::assertEquals($card->description, $cardR->description); self::assertEquals($card->column, $cardR->column); self::assertEquals($card->order, $cardR->order); self::assertEquals($card->getStatus(), $cardR->getStatus()); self::assertEquals($card->getType(), $cardR->getType()); - self::assertEquals($card->createdBy->getId(), $cardR->createdBy->getId()); + self::assertEquals($card->createdBy->id, $cardR->createdBy->id); self::assertEquals($card->createdAt->format('Y-m-d'), $cardR->createdAt->format('Y-m-d')); self::assertEquals($card->ref, $cardR->ref); } @@ -79,7 +79,7 @@ final class KanbanCardMapperTest extends \PHPUnit\Framework\TestCase $card->addTag(new Tag()); $id = KanbanCardMapper::create()->execute($card); - self::assertGreaterThan(0, $card->getId()); - self::assertEquals($id, $card->getId()); + self::assertGreaterThan(0, $card->id); + self::assertEquals($id, $card->id); } } diff --git a/tests/Models/KanbanCardTest.php b/tests/Models/KanbanCardTest.php index 9cc17a9..2121d2f 100755 --- a/tests/Models/KanbanCardTest.php +++ b/tests/Models/KanbanCardTest.php @@ -43,14 +43,14 @@ final class KanbanCardTest extends \PHPUnit\Framework\TestCase */ public function testDefault() : void { - self::assertEquals(0, $this->card->getId()); + self::assertEquals(0, $this->card->id); self::assertEquals(CardStatus::ACTIVE, $this->card->getStatus()); self::assertEquals(CardType::TEXT, $this->card->getType()); self::assertEquals('', $this->card->name); self::assertEquals('', $this->card->description); self::assertEquals(0, $this->card->column); self::assertEquals(0, $this->card->order); - self::assertEquals(0, $this->card->createdBy->getId()); + self::assertEquals(0, $this->card->createdBy->id); self::assertInstanceOf('\DateTimeImmutable', $this->card->createdAt); self::assertEquals([], $this->card->getComments()); self::assertEquals([], $this->card->getTags()); diff --git a/tests/Models/KanbanColumnMapperTest.php b/tests/Models/KanbanColumnMapperTest.php index ab49a03..a943bb6 100755 --- a/tests/Models/KanbanColumnMapperTest.php +++ b/tests/Models/KanbanColumnMapperTest.php @@ -36,10 +36,10 @@ final class KanbanColumnMapperTest extends \PHPUnit\Framework\TestCase $column->order = 1; $id = KanbanColumnMapper::create()->execute($column); - self::assertGreaterThan(0, $column->getId()); - self::assertEquals($id, $column->getId()); + self::assertGreaterThan(0, $column->id); + self::assertEquals($id, $column->id); - $columnR = KanbanColumnMapper::get()->where('id', $column->getId())->execute(); + $columnR = KanbanColumnMapper::get()->where('id', $column->id)->execute(); self::assertEquals($column->name, $columnR->name); self::assertEquals($column->board, $columnR->board); self::assertEquals($column->order, $columnR->order); diff --git a/tests/Models/KanbanColumnTest.php b/tests/Models/KanbanColumnTest.php index fc69662..1a53c6a 100755 --- a/tests/Models/KanbanColumnTest.php +++ b/tests/Models/KanbanColumnTest.php @@ -38,7 +38,7 @@ final class KanbanColumnTest extends \PHPUnit\Framework\TestCase */ public function testDefault() : void { - self::assertEquals(0, $this->column->getId()); + self::assertEquals(0, $this->column->id); self::assertEquals('', $this->column->name); self::assertEquals(0, $this->column->order); self::assertEquals(0, $this->column->board); diff --git a/tests/Models/NullKanbanBoardTest.php b/tests/Models/NullKanbanBoardTest.php index 19bbde3..9500a0e 100755 --- a/tests/Models/NullKanbanBoardTest.php +++ b/tests/Models/NullKanbanBoardTest.php @@ -37,6 +37,6 @@ final class NullKanbanBoardTest extends \PHPUnit\Framework\TestCase public function testId() : void { $null = new NullKanbanBoard(2); - self::assertEquals(2, $null->getId()); + self::assertEquals(2, $null->id); } } diff --git a/tests/Models/NullKanbanCardCommentTest.php b/tests/Models/NullKanbanCardCommentTest.php index 4373e1a..24cf25a 100755 --- a/tests/Models/NullKanbanCardCommentTest.php +++ b/tests/Models/NullKanbanCardCommentTest.php @@ -37,6 +37,6 @@ final class NullKanbanCardCommentTest extends \PHPUnit\Framework\TestCase public function testId() : void { $null = new NullKanbanCardComment(2); - self::assertEquals(2, $null->getId()); + self::assertEquals(2, $null->id); } } diff --git a/tests/Models/NullKanbanCardTest.php b/tests/Models/NullKanbanCardTest.php index 9c5a611..b3912c3 100755 --- a/tests/Models/NullKanbanCardTest.php +++ b/tests/Models/NullKanbanCardTest.php @@ -37,6 +37,6 @@ final class NullKanbanCardTest extends \PHPUnit\Framework\TestCase public function testId() : void { $null = new NullKanbanCard(2); - self::assertEquals(2, $null->getId()); + self::assertEquals(2, $null->id); } } diff --git a/tests/Models/NullKanbanColumnTest.php b/tests/Models/NullKanbanColumnTest.php index 7e6c996..dd57e49 100755 --- a/tests/Models/NullKanbanColumnTest.php +++ b/tests/Models/NullKanbanColumnTest.php @@ -37,6 +37,6 @@ final class NullKanbanColumnTest extends \PHPUnit\Framework\TestCase public function testId() : void { $null = new NullKanbanColumn(2); - self::assertEquals(2, $null->getId()); + self::assertEquals(2, $null->id); } }