From 052fcf7aafeb5097a9eb5e6178d4e3de9a22b6ad Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Fri, 17 Aug 2018 20:02:29 +0200 Subject: [PATCH] fix #96 fix #97 --- Admin/Routes/Web/Backend.php | 8 ++++++++ Controller.php | 7 ------- Models/PermissionState.php | 8 +++----- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index a030caa..6687082 100644 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -1,12 +1,20 @@ [ [ 'dest' => '\Modules\Calendar\Controller:viewCalendarDashboard', 'verb' => RouteVerb::GET, + 'permission' => [ + 'module' => Controller::MODULE_NAME, + 'type' => PermissionType::READ, + 'state' => PermissionState::CALENDAR, + ], ], ], ]; diff --git a/Controller.php b/Controller.php index 39fa3f4..6e85313 100644 --- a/Controller.php +++ b/Controller.php @@ -104,13 +104,6 @@ final class Controller extends ModuleAbstract implements WebInterface { $view = new View($this->app, $request, $response); - if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission( - PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::DASHBOARD) - ) { - $view->setTemplate('/Web/Backend/Error/403_inline'); - return $view; - } - /** @var Head $head */ $head = $response->get('Content')->getData('head'); $head->addAsset(AssetType::CSS, '/Modules/Calendar/Theme/Backend/css/styles.css'); diff --git a/Models/PermissionState.php b/Models/PermissionState.php index 2139cf0..09a96f1 100644 --- a/Models/PermissionState.php +++ b/Models/PermissionState.php @@ -4,7 +4,7 @@ * * PHP Version 7.2 * - * @package TBD + * @package Modules\Calendar * @copyright Dennis Eichhorn * @license OMS License 1.0 * @version 1.0.0 @@ -19,14 +19,12 @@ use phpOMS\Stdlib\Base\Enum; /** * Permision state enum. * - * @package Tasks + * @package Modules\Calendar * @license OMS License 1.0 * @link http://website.orange-management.de * @since 1.0.0 */ abstract class PermissionState extends Enum { - public const DASHBOARD = 1; - public const EVENT = 2; - public const CALENDAR = 3; + public const CALENDAR = 1; }