changed badly named permission type to permission category because type should only be read/write/...

This commit is contained in:
Dennis Eichhorn 2022-03-17 23:01:30 +01:00
parent 47b10ae296
commit 00ff30ad95
4 changed files with 15 additions and 15 deletions

View File

@ -13,7 +13,7 @@
declare(strict_types=1); declare(strict_types=1);
use Modules\Tasks\Controller\ApiController; use Modules\Tasks\Controller\ApiController;
use Modules\Tasks\Models\PermissionState; use Modules\Tasks\Models\PermissionCategory;
use phpOMS\Account\PermissionType; use phpOMS\Account\PermissionType;
use phpOMS\Router\RouteVerb; use phpOMS\Router\RouteVerb;
@ -25,7 +25,7 @@ return [
'permission' => [ 'permission' => [
'module' => ApiController::NAME, 'module' => ApiController::NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
'state' => PermissionState::TASK, 'state' => PermissionCategory::TASK,
], ],
], ],
[ [
@ -34,7 +34,7 @@ return [
'permission' => [ 'permission' => [
'module' => ApiController::NAME, 'module' => ApiController::NAME,
'type' => PermissionType::MODIFY, 'type' => PermissionType::MODIFY,
'state' => PermissionState::TASK, 'state' => PermissionCategory::TASK,
], ],
], ],
[ [
@ -43,7 +43,7 @@ return [
'permission' => [ 'permission' => [
'module' => ApiController::NAME, 'module' => ApiController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::TASK, 'state' => PermissionCategory::TASK,
], ],
], ],
], ],
@ -54,7 +54,7 @@ return [
'permission' => [ 'permission' => [
'module' => ApiController::NAME, 'module' => ApiController::NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
'state' => PermissionState::ELEMENT, 'state' => PermissionCategory::ELEMENT,
], ],
], ],
[ [
@ -63,7 +63,7 @@ return [
'permission' => [ 'permission' => [
'module' => ApiController::NAME, 'module' => ApiController::NAME,
'type' => PermissionType::MODIFY, 'type' => PermissionType::MODIFY,
'state' => PermissionState::ELEMENT, 'state' => PermissionCategory::ELEMENT,
], ],
], ],
[ [
@ -72,7 +72,7 @@ return [
'permission' => [ 'permission' => [
'module' => ApiController::NAME, 'module' => ApiController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::TASK, 'state' => PermissionCategory::TASK,
], ],
], ],
], ],

View File

@ -13,7 +13,7 @@
declare(strict_types=1); declare(strict_types=1);
use Modules\Tasks\Controller\BackendController; use Modules\Tasks\Controller\BackendController;
use Modules\Tasks\Models\PermissionState; use Modules\Tasks\Models\PermissionCategory;
use phpOMS\Account\PermissionType; use phpOMS\Account\PermissionType;
use phpOMS\Router\RouteVerb; use phpOMS\Router\RouteVerb;
@ -25,7 +25,7 @@ return [
'permission' => [ 'permission' => [
'module' => BackendController::NAME, 'module' => BackendController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::TASK, 'state' => PermissionCategory::TASK,
], ],
], ],
], ],
@ -36,7 +36,7 @@ return [
'permission' => [ 'permission' => [
'module' => BackendController::NAME, 'module' => BackendController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::TASK, 'state' => PermissionCategory::TASK,
], ],
], ],
], ],
@ -47,7 +47,7 @@ return [
'permission' => [ 'permission' => [
'module' => BackendController::NAME, 'module' => BackendController::NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
'state' => PermissionState::TASK, 'state' => PermissionCategory::TASK,
], ],
], ],
], ],
@ -58,7 +58,7 @@ return [
'permission' => [ 'permission' => [
'module' => BackendController::NAME, 'module' => BackendController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::ANALYSIS, 'state' => PermissionCategory::ANALYSIS,
], ],
], ],
], ],

View File

@ -16,7 +16,7 @@ namespace Modules\Tasks\Controller;
use Modules\Dashboard\Models\DashboardElementInterface; use Modules\Dashboard\Models\DashboardElementInterface;
use Modules\Media\Models\MediaMapper; use Modules\Media\Models\MediaMapper;
use Modules\Tasks\Models\PermissionState; use Modules\Tasks\Models\PermissionCategory;
use Modules\Tasks\Models\TaskMapper; use Modules\Tasks\Models\TaskMapper;
use Modules\Tasks\Views\TaskView; use Modules\Tasks\Views\TaskView;
use phpOMS\Account\PermissionType; use phpOMS\Account\PermissionType;
@ -172,7 +172,7 @@ final class BackendController extends Controller implements DashboardElementInte
|| $task->isCCAccount($accountId) || $task->isCCAccount($accountId)
|| $task->isToAccount($accountId)) || $task->isToAccount($accountId))
&& !$this->app->accountManager->get($accountId)->hasPermission( && !$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'); $view->setTemplate('/Web/Backend/Error/403_inline');
$response->header->status = RequestStatusCode::R_403; $response->header->status = RequestStatusCode::R_403;

View File

@ -24,7 +24,7 @@ use phpOMS\Stdlib\Base\Enum;
* @link https://karaka.app * @link https://karaka.app
* @since 1.0.0 * @since 1.0.0
*/ */
abstract class PermissionState extends Enum abstract class PermissionCategory extends Enum
{ {
public const TASK = 1; public const TASK = 1;