From 00ff30ad95ee2c5569238e491b8b22b51a3f7758 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Thu, 17 Mar 2022 23:01:30 +0100 Subject: [PATCH] changed badly named permission type to permission category because type should only be read/write/... --- Admin/Routes/Web/Api.php | 14 +++++++------- Admin/Routes/Web/Backend.php | 10 +++++----- Controller/BackendController.php | 4 ++-- ...{PermissionState.php => PermissionCategory.php} | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) rename Models/{PermissionState.php => PermissionCategory.php} (91%) diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php index f9f6b8c..11a30fc 100755 --- a/Admin/Routes/Web/Api.php +++ b/Admin/Routes/Web/Api.php @@ -13,7 +13,7 @@ declare(strict_types=1); use Modules\Tasks\Controller\ApiController; -use Modules\Tasks\Models\PermissionState; +use Modules\Tasks\Models\PermissionCategory; use phpOMS\Account\PermissionType; use phpOMS\Router\RouteVerb; @@ -25,7 +25,7 @@ return [ 'permission' => [ 'module' => ApiController::NAME, 'type' => PermissionType::CREATE, - 'state' => PermissionState::TASK, + 'state' => PermissionCategory::TASK, ], ], [ @@ -34,7 +34,7 @@ return [ 'permission' => [ 'module' => ApiController::NAME, 'type' => PermissionType::MODIFY, - 'state' => PermissionState::TASK, + 'state' => PermissionCategory::TASK, ], ], [ @@ -43,7 +43,7 @@ return [ 'permission' => [ 'module' => ApiController::NAME, 'type' => PermissionType::READ, - 'state' => PermissionState::TASK, + 'state' => PermissionCategory::TASK, ], ], ], @@ -54,7 +54,7 @@ return [ 'permission' => [ 'module' => ApiController::NAME, 'type' => PermissionType::CREATE, - 'state' => PermissionState::ELEMENT, + 'state' => PermissionCategory::ELEMENT, ], ], [ @@ -63,7 +63,7 @@ return [ 'permission' => [ 'module' => ApiController::NAME, 'type' => PermissionType::MODIFY, - 'state' => PermissionState::ELEMENT, + 'state' => PermissionCategory::ELEMENT, ], ], [ @@ -72,7 +72,7 @@ return [ 'permission' => [ 'module' => ApiController::NAME, 'type' => PermissionType::READ, - 'state' => PermissionState::TASK, + 'state' => PermissionCategory::TASK, ], ], ], diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index 590f165..28091c9 100755 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -13,7 +13,7 @@ declare(strict_types=1); use Modules\Tasks\Controller\BackendController; -use Modules\Tasks\Models\PermissionState; +use Modules\Tasks\Models\PermissionCategory; use phpOMS\Account\PermissionType; use phpOMS\Router\RouteVerb; @@ -25,7 +25,7 @@ return [ 'permission' => [ 'module' => BackendController::NAME, 'type' => PermissionType::READ, - 'state' => PermissionState::TASK, + 'state' => PermissionCategory::TASK, ], ], ], @@ -36,7 +36,7 @@ return [ 'permission' => [ 'module' => BackendController::NAME, 'type' => PermissionType::READ, - 'state' => PermissionState::TASK, + 'state' => PermissionCategory::TASK, ], ], ], @@ -47,7 +47,7 @@ return [ 'permission' => [ 'module' => BackendController::NAME, 'type' => PermissionType::CREATE, - 'state' => PermissionState::TASK, + 'state' => PermissionCategory::TASK, ], ], ], @@ -58,7 +58,7 @@ return [ 'permission' => [ 'module' => BackendController::NAME, 'type' => PermissionType::READ, - 'state' => PermissionState::ANALYSIS, + 'state' => PermissionCategory::ANALYSIS, ], ], ], diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 4c1bdd3..b74a383 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -16,7 +16,7 @@ namespace Modules\Tasks\Controller; use Modules\Dashboard\Models\DashboardElementInterface; use Modules\Media\Models\MediaMapper; -use Modules\Tasks\Models\PermissionState; +use Modules\Tasks\Models\PermissionCategory; use Modules\Tasks\Models\TaskMapper; use Modules\Tasks\Views\TaskView; use phpOMS\Account\PermissionType; @@ -172,7 +172,7 @@ final class BackendController extends Controller implements DashboardElementInte || $task->isCCAccount($accountId) || $task->isToAccount($accountId)) && !$this->app->accountManager->get($accountId)->hasPermission( - PermissionType::READ, $this->app->orgId, $this->app->appName, self::NAME, PermissionState::TASK, $task->getId()) + PermissionType::READ, $this->app->orgId, $this->app->appName, self::NAME, PermissionCategory::TASK, $task->getId()) ) { $view->setTemplate('/Web/Backend/Error/403_inline'); $response->header->status = RequestStatusCode::R_403; diff --git a/Models/PermissionState.php b/Models/PermissionCategory.php similarity index 91% rename from Models/PermissionState.php rename to Models/PermissionCategory.php index 11f812e..b749cda 100755 --- a/Models/PermissionState.php +++ b/Models/PermissionCategory.php @@ -24,7 +24,7 @@ use phpOMS\Stdlib\Base\Enum; * @link https://karaka.app * @since 1.0.0 */ -abstract class PermissionState extends Enum +abstract class PermissionCategory extends Enum { public const TASK = 1;