From bd8d1ddd1641bc28d61870c731560774bf9d0045 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Thu, 17 Mar 2022 23:01:29 +0100 Subject: [PATCH] changed badly named permission type to permission category because type should only be read/write/... --- Admin/Routes/Web/Api.php | 6 +++--- Admin/Routes/Web/Backend.php | 8 ++++---- Admin/Routes/Web/Timerecording.php | 6 +++--- Controller/ApiController.php | 6 +++--- Models/{PermissionState.php => PermissionCategory.php} | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) rename Models/{PermissionState.php => PermissionCategory.php} (93%) diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php index 79d3336..bc3baf1 100755 --- a/Admin/Routes/Web/Api.php +++ b/Admin/Routes/Web/Api.php @@ -13,7 +13,7 @@ declare(strict_types=1); use Modules\HumanResourceTimeRecording\Controller\ApiController; -use Modules\HumanResourceTimeRecording\Models\PermissionState; +use Modules\HumanResourceTimeRecording\Models\PermissionCategory; use phpOMS\Account\PermissionType; use phpOMS\Router\RouteVerb; @@ -25,7 +25,7 @@ return [ 'permission' => [ 'module' => ApiController::NAME, 'type' => PermissionType::CREATE, - 'state' => PermissionState::SESSION, + 'state' => PermissionCategory::SESSION, ], ], ], @@ -36,7 +36,7 @@ return [ 'permission' => [ 'module' => ApiController::NAME, 'type' => PermissionType::CREATE, - 'state' => PermissionState::SESSION_ELEMENT, + 'state' => PermissionCategory::SESSION_ELEMENT, ], ], ], diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index 11bcb8a..cbe6f4e 100755 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -13,7 +13,7 @@ declare(strict_types=1); use Modules\HumanResourceTimeRecording\Controller\BackendController; -use Modules\HumanResourceTimeRecording\Models\PermissionState; +use Modules\HumanResourceTimeRecording\Models\PermissionCategory; use phpOMS\Account\PermissionType; use phpOMS\Router\RouteVerb; @@ -25,7 +25,7 @@ return [ 'permission' => [ 'module' => BackendController::NAME, 'type' => PermissionType::READ, - 'state' => PermissionState::DASHBOARD, + 'state' => PermissionCategory::DASHBOARD, ], ], ], @@ -36,7 +36,7 @@ return [ 'permission' => [ 'module' => BackendController::NAME, 'type' => PermissionType::READ, - 'state' => PermissionState::PRIVATE_DASHBOARD, + 'state' => PermissionCategory::PRIVATE_DASHBOARD, ], ], ], @@ -47,7 +47,7 @@ return [ 'permission' => [ 'module' => BackendController::NAME, 'type' => PermissionType::READ, - 'state' => PermissionState::PRIVATE_DASHBOARD, + 'state' => PermissionCategory::PRIVATE_DASHBOARD, ], ], ], diff --git a/Admin/Routes/Web/Timerecording.php b/Admin/Routes/Web/Timerecording.php index 361910d..fb26ea4 100755 --- a/Admin/Routes/Web/Timerecording.php +++ b/Admin/Routes/Web/Timerecording.php @@ -1,7 +1,7 @@ [ 'module' => TimerecordingController::NAME, 'type' => PermissionType::READ, - 'state' => PermissionState::DASHBOARD, + 'state' => PermissionCategory::DASHBOARD, ], ], ], @@ -24,7 +24,7 @@ return [ 'permission' => [ 'module' => TimerecordingController::NAME, 'type' => PermissionType::READ, - 'state' => PermissionState::DASHBOARD, + 'state' => PermissionCategory::DASHBOARD, ], ], ], diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 8b881f1..30adbde 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -19,7 +19,7 @@ use Modules\HumanResourceManagement\Models\NullEmployee; use Modules\HumanResourceTimeRecording\Models\ClockingStatus; use Modules\HumanResourceTimeRecording\Models\ClockingType; use Modules\HumanResourceTimeRecording\Models\NullSession; -use Modules\HumanResourceTimeRecording\Models\PermissionState; +use Modules\HumanResourceTimeRecording\Models\PermissionCategory; use Modules\HumanResourceTimeRecording\Models\Session; use Modules\HumanResourceTimeRecording\Models\SessionElement; use Modules\HumanResourceTimeRecording\Models\SessionElementMapper; @@ -57,7 +57,7 @@ final class ApiController extends Controller public function apiSessionCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void { if ($request->getData('account') !== null && !$this->app->accountManager->get($request->header->account)->hasPermission( - PermissionType::CREATE, $this->app->orgId, $this->app->appName, self::NAME, PermissionState::SESSION_FOREIGN + PermissionType::CREATE, $this->app->orgId, $this->app->appName, self::NAME, PermissionCategory::SESSION_FOREIGN )) { $response->header->status = RequestStatusCode::R_403; @@ -154,7 +154,7 @@ final class ApiController extends Controller if ($request->getData('account') !== null && ((int) $request->getData('account')) !== $request->header->account ) { if (!$this->app->accountManager->get($request->header->account)->hasPermission( - PermissionType::CREATE, $this->app->orgId, $this->app->appName, self::NAME, PermissionState::SESSION_ELEMENT_FOREIGN + PermissionType::CREATE, $this->app->orgId, $this->app->appName, self::NAME, PermissionCategory::SESSION_ELEMENT_FOREIGN )) { $response->header->status = RequestStatusCode::R_403; diff --git a/Models/PermissionState.php b/Models/PermissionCategory.php similarity index 93% rename from Models/PermissionState.php rename to Models/PermissionCategory.php index 48c6d89..31db682 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 DASHBOARD = 1;