Jingga/oms-Draw
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Draw.git synced 2026-02-15 14:48:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix #96 fix #97

Browse Source
This commit is contained in:
Dennis Eichhorn 2018-08-17 20:02:29 +02:00
parent 436f729007
commit 4cca18d4a8
4 changed files with 37 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Admin/Routes/Web/Api.php
View File

@ -1,12 +1,20 @@
<?php <?php
use phpOMS\Router\RouteVerb; use phpOMS\Router\RouteVerb;
use phpOMS\Account\PermissionType;
use Modules\Draw\Models\PermissionState;
use Modules\Draw\Controller;
return [ return [
'^.*/api/draw.*$' => [ '^.*/api/draw.*$' => [
[ [
'dest' => '\Modules\Draw\Controller:apiDrawCreate', 'dest' => '\Modules\Draw\Controller:apiDrawCreate',
'verb' => RouteVerb::SET, 'verb' => RouteVerb::SET,
'permission' => [
'module' => Controller::MODULE_NAME,
'type' => PermissionType::CREATE,
'state' => PermissionState::DRAW,
],
], ],
], ],
]; ];

28
Admin/Routes/Web/Backend.php
View File

@ -1,32 +1,60 @@
<?php <?php
use phpOMS\Router\RouteVerb; use phpOMS\Router\RouteVerb;
use phpOMS\Account\PermissionType;
use Modules\Draw\Models\PermissionState;
use Modules\Draw\Controller;
return [ return [
'^.*/backend/draw/create.*$' => [ '^.*/backend/draw/create.*$' => [
[ [
'dest' => '\Modules\Draw\Controller:setUpDrawEditor', 'dest' => '\Modules\Draw\Controller:setUpDrawEditor',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [
'module' => Controller::MODULE_NAME,
'type' => PermissionType::CREATE,
'state' => PermissionState::DRAW,
],
], ],
[ [
'dest' => '\Modules\Draw\Controller:viewDrawCreate', 'dest' => '\Modules\Draw\Controller:viewDrawCreate',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [
'module' => Controller::MODULE_NAME,
'type' => PermissionType::CREATE,
'state' => PermissionState::DRAW,
],
], ],
], ],
'^.*/backend/draw/list.*$' => [ '^.*/backend/draw/list.*$' => [
[ [
'dest' => '\Modules\Draw\Controller:viewDrawList', 'dest' => '\Modules\Draw\Controller:viewDrawList',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [
'module' => Controller::MODULE_NAME,
'type' => PermissionType::READ,
'state' => PermissionState::DRAW,
],
], ],
], ],
'^.*/backend/draw/single.*$' => [ '^.*/backend/draw/single.*$' => [
[ [
'dest' => '\Modules\Draw\Controller:setUpDrawEditor', 'dest' => '\Modules\Draw\Controller:setUpDrawEditor',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [
'module' => Controller::MODULE_NAME,
'type' => PermissionType::READ,
'state' => PermissionState::DRAW,
],
], ],
[ [
'dest' => '\Modules\Draw\Controller:viewDrawSingle', 'dest' => '\Modules\Draw\Controller:viewDrawSingle',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [
'module' => Controller::MODULE_NAME,
'type' => PermissionType::READ,
'state' => PermissionState::DRAW,
],
], ],
], ],
]; ];

24
Controller.php
View File

@ -125,14 +125,6 @@ final class Controller extends ModuleAbstract implements WebInterface
{ {
$view = new View($this->app, $request, $response); $view = new View($this->app, $request, $response);
if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
PermissionType::CREATE, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::DRAW)
) {
$view->setTemplate('/Web/Backend/Error/403_inline');
$response->getHeader()->setStatusCode(RequestStatusCode::R_403);
return $view;
}
$view->setTemplate('/Modules/Draw/Theme/Backend/draw-create'); $view->setTemplate('/Modules/Draw/Theme/Backend/draw-create');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005201001, $request, $response)); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005201001, $request, $response));
@ -187,14 +179,6 @@ final class Controller extends ModuleAbstract implements WebInterface
{ {
$view = new View($this->app, $request, $response); $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');
$response->getHeader()->setStatusCode(RequestStatusCode::R_403);
return $view;
}
$view->setTemplate('/Modules/Draw/Theme/Backend/draw-list'); $view->setTemplate('/Modules/Draw/Theme/Backend/draw-list');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005201001, $request, $response)); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005201001, $request, $response));
@ -238,14 +222,6 @@ final class Controller extends ModuleAbstract implements WebInterface
*/ */
public function apiDrawCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public function apiDrawCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{ {
if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
PermissionType::CREATE, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::DRAW)
) {
$response->set('draw_create', null);
$response->getHeader()->setStatusCode(RequestStatusCode::R_403);
return;
}
if (!empty($val = $this->validateDrawCreate($request))) { if (!empty($val = $this->validateDrawCreate($request))) {
$response->set('draw_create', new FormValidation($val)); $response->set('draw_create', new FormValidation($val));

3
Models/PermissionState.php
View File

@ -26,6 +26,5 @@ use phpOMS\Stdlib\Base\Enum;
*/ */
abstract class PermissionState extends Enum abstract class PermissionState extends Enum
{ {
public const DASHBOARD = 1; public const DRAW = 1;
public const DRAW = 2;
} }