diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php index ee084e7..12e071c 100755 --- a/Admin/Routes/Web/Api.php +++ b/Admin/Routes/Web/Api.php @@ -13,7 +13,7 @@ declare(strict_types=1); use Modules\News\Controller\ApiController; -use Modules\News\Models\PermissionState; +use Modules\News\Models\PermissionCategory; use phpOMS\Account\PermissionType; use phpOMS\Router\RouteVerb; @@ -25,7 +25,7 @@ return [ 'permission' => [ 'module' => ApiController::NAME, 'type' => PermissionType::CREATE, - 'state' => PermissionState::NEWS, + 'state' => PermissionCategory::NEWS, ], ], [ @@ -34,7 +34,7 @@ return [ 'permission' => [ 'module' => ApiController::NAME, 'type' => PermissionType::MODIFY, - 'state' => PermissionState::NEWS, + 'state' => PermissionCategory::NEWS, ], ], [ @@ -43,7 +43,7 @@ return [ 'permission' => [ 'module' => ApiController::NAME, 'type' => PermissionType::READ, - 'state' => PermissionState::NEWS, + 'state' => PermissionCategory::NEWS, ], ], [ @@ -52,7 +52,7 @@ return [ 'permission' => [ 'module' => ApiController::NAME, 'type' => PermissionType::DELETE, - 'state' => PermissionState::NEWS, + 'state' => PermissionCategory::NEWS, ], ], ], diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index 37e3149..ff031b6 100755 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -13,7 +13,7 @@ declare(strict_types=1); use Modules\News\Controller\BackendController; -use Modules\News\Models\PermissionState; +use Modules\News\Models\PermissionCategory; use phpOMS\Account\PermissionType; use phpOMS\Router\RouteVerb; @@ -25,7 +25,7 @@ return [ 'permission' => [ 'module' => BackendController::NAME, 'type' => PermissionType::READ, - 'state' => PermissionState::NEWS, + 'state' => PermissionCategory::NEWS, ], ], ], @@ -36,7 +36,7 @@ return [ 'permission' => [ 'module' => BackendController::NAME, 'type' => PermissionType::READ, - 'state' => PermissionState::NEWS, + 'state' => PermissionCategory::NEWS, ], ], ], @@ -47,7 +47,7 @@ return [ 'permission' => [ 'module' => BackendController::NAME, 'type' => PermissionType::READ, - 'state' => PermissionState::NEWS, + 'state' => PermissionCategory::NEWS, ], ], ], @@ -58,7 +58,7 @@ return [ 'permission' => [ 'module' => BackendController::NAME, 'type' => PermissionType::MODIFY, - 'state' => PermissionState::NEWS, + 'state' => PermissionCategory::NEWS, ], ], ], @@ -69,7 +69,7 @@ return [ 'permission' => [ 'module' => BackendController::NAME, 'type' => PermissionType::CREATE, - 'state' => PermissionState::NEWS, + 'state' => PermissionCategory::NEWS, ], ], ], @@ -80,7 +80,7 @@ return [ 'permission' => [ 'module' => BackendController::NAME, 'type' => PermissionType::MODIFY, - 'state' => PermissionState::NEWS, + 'state' => PermissionCategory::NEWS, ], ], ], @@ -91,7 +91,7 @@ return [ 'permission' => [ 'module' => BackendController::NAME, 'type' => PermissionType::MODIFY, - 'state' => PermissionState::ANALYSIS, + 'state' => PermissionCategory::ANALYSIS, ], ], ], diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 5840424..5e798df 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -20,7 +20,7 @@ use Modules\News\Models\NewsSeen; use Modules\News\Models\NewsSeenMapper; use Modules\News\Models\NewsStatus; use Modules\News\Models\NullNewsSeen; -use Modules\News\Models\PermissionState; +use Modules\News\Models\PermissionCategory; use phpOMS\Account\PermissionType; use phpOMS\Contract\RenderableInterface; use phpOMS\DataStorage\Database\Query\OrderType; @@ -164,7 +164,7 @@ final class BackendController extends Controller implements DashboardElementInte if ($article->createdBy->getId() !== $accountId && !$this->app->accountManager->get($accountId)->hasPermission( - PermissionType::READ, $this->app->orgId, $this->app->appName, self::NAME, PermissionState::NEWS, $article->getId()) + PermissionType::READ, $this->app->orgId, $this->app->appName, self::NAME, PermissionCategory::NEWS, $article->getId()) ) { $view->setTemplate('/Web/Backend/Error/403_inline'); $response->header->status = RequestStatusCode::R_403; @@ -189,7 +189,7 @@ final class BackendController extends Controller implements DashboardElementInte $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000601001, $request, $response)); $view->addData('news', $article); $view->addData('editable', $this->app->accountManager->get($accountId)->hasPermission( - PermissionType::MODIFY, $this->app->orgId, $this->app->appName, self::NAME, PermissionState::NEWS, $article->getId()) + PermissionType::MODIFY, $this->app->orgId, $this->app->appName, self::NAME, PermissionCategory::NEWS, $article->getId()) ); // allow comments diff --git a/Models/PermissionState.php b/Models/PermissionCategory.php similarity index 91% rename from Models/PermissionState.php rename to Models/PermissionCategory.php index ab72f89..e970f91 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 NEWS = 1;