Jingga/oms-Script
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Script.git synced 2026-02-13 03:28:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rename module constants and fix some unit test bugs

Browse Source
This commit is contained in:
Dennis Eichhorn 2021-09-28 18:28:42 +02:00
parent d9b6689859
commit 159100460b
5 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,7 +23,7 @@ return [
'dest' => '\Modules\Helper\Controller\ApiController:apiHelperExport', 'dest' => '\Modules\Helper\Controller\ApiController:apiHelperExport',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::REPORT, 'state' => PermissionState::REPORT,
], ],
@ -34,7 +34,7 @@ return [
'dest' => '\Modules\Helper\Controller\ApiController:apiTemplateCreate', 'dest' => '\Modules\Helper\Controller\ApiController:apiTemplateCreate',
'verb' => RouteVerb::SET, 'verb' => RouteVerb::SET,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::TEMPLATE, 'state' => PermissionState::TEMPLATE,
], ],
@ -45,7 +45,7 @@ return [
'dest' => '\Modules\Helper\Controller\ApiController:apiReportCreate', 'dest' => '\Modules\Helper\Controller\ApiController:apiReportCreate',
'verb' => RouteVerb::SET, 'verb' => RouteVerb::SET,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
'state' => PermissionState::REPORT, 'state' => PermissionState::REPORT,
], ],

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

@ -23,7 +23,7 @@ return [
'dest' => '\Modules\Media\Controller\BackendController::setUpFileUploaderTrait', 'dest' => '\Modules\Media\Controller\BackendController::setUpFileUploaderTrait',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
'state' => PermissionState::TEMPLATE, 'state' => PermissionState::TEMPLATE,
], ],
@ -32,7 +32,7 @@ return [
'dest' => '\Modules\Helper\Controller\BackendController:viewTemplateCreate', 'dest' => '\Modules\Helper\Controller\BackendController:viewTemplateCreate',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
'state' => PermissionState::TEMPLATE, 'state' => PermissionState::TEMPLATE,
], ],
@ -43,7 +43,7 @@ return [
'dest' => '\Modules\Media\Controller\BackendController::setUpFileUploaderTrait', 'dest' => '\Modules\Media\Controller\BackendController::setUpFileUploaderTrait',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
'state' => PermissionState::REPORT, 'state' => PermissionState::REPORT,
], ],
@ -52,7 +52,7 @@ return [
'dest' => '\Modules\Helper\Controller\BackendController:viewReportCreate', 'dest' => '\Modules\Helper\Controller\BackendController:viewReportCreate',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
'state' => PermissionState::REPORT, 'state' => PermissionState::REPORT,
], ],
@ -63,7 +63,7 @@ return [
'dest' => '\Modules\Helper\Controller\BackendController:viewTemplateList', 'dest' => '\Modules\Helper\Controller\BackendController:viewTemplateList',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::REPORT, 'state' => PermissionState::REPORT,
], ],
@ -74,7 +74,7 @@ return [
'dest' => '\Modules\Helper\Controller\BackendController:viewHelperReport', 'dest' => '\Modules\Helper\Controller\BackendController:viewHelperReport',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::REPORT, 'state' => PermissionState::REPORT,
], ],

12
Controller/ApiController.php
View File

@ -74,7 +74,7 @@ final class ApiController extends Controller
// is allowed to read // is allowed to read
if (!$this->app->accountManager->get($accountId)->hasPermission( if (!$this->app->accountManager->get($accountId)->hasPermission(
PermissionType::READ, $this->app->orgId, null, self::MODULE_NAME, PermissionState::REPORT, $template->getId()) PermissionType::READ, $this->app->orgId, null, self::NAME, PermissionState::REPORT, $template->getId())
) { ) {
$response->header->status = RequestStatusCode::R_403; $response->header->status = RequestStatusCode::R_403;
@ -84,7 +84,7 @@ final class ApiController extends Controller
if (\in_array($request->getData('type'), ['xlsx', 'pdf', 'docx', 'pptx', 'csv'])) { if (\in_array($request->getData('type'), ['xlsx', 'pdf', 'docx', 'pptx', 'csv'])) {
// is allowed to export // is allowed to export
if (!$this->app->accountManager->get($accountId)->hasPermission( if (!$this->app->accountManager->get($accountId)->hasPermission(
PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::EXPORT PermissionType::READ, $this->app->orgId, $this->app->appName, self::NAME, PermissionState::EXPORT
)) { )) {
$response->header->status = RequestStatusCode::R_403; $response->header->status = RequestStatusCode::R_403;
@ -345,8 +345,8 @@ final class ApiController extends Controller
$request->header->account, $request->header->account,
$this->app->orgId, $this->app->orgId,
$this->app->appName, $this->app->appName,
self::MODULE_NAME, self::NAME,
self::MODULE_NAME, self::NAME,
PermissionState::TEMPLATE, PermissionState::TEMPLATE,
$template->getId(), $template->getId(),
null, null,
@ -456,8 +456,8 @@ final class ApiController extends Controller
$request->header->account, $request->header->account,
$this->app->orgId, $this->app->orgId,
$this->app->appName, $this->app->appName,
self::MODULE_NAME, self::NAME,
self::MODULE_NAME, self::NAME,
PermissionState::REPORT, PermissionState::REPORT,
$report->getId(), $report->getId(),
null, null,

8
Controller/Controller.php
View File

@ -32,7 +32,7 @@ class Controller extends ModuleAbstract
* @var string * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
public const MODULE_PATH = __DIR__ . '/../'; public const PATH = __DIR__ . '/../';
/** /**
* Module version. * Module version.
@ -40,7 +40,7 @@ class Controller extends ModuleAbstract
* @var string * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
public const MODULE_VERSION = '1.0.0'; public const VERSION = '1.0.0';
/** /**
* Module name. * Module name.
@ -48,7 +48,7 @@ class Controller extends ModuleAbstract
* @var string * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
public const MODULE_NAME = 'Helper'; public const NAME = 'Helper';
/** /**
* Module id. * Module id.
@ -56,7 +56,7 @@ class Controller extends ModuleAbstract
* @var int * @var int
* @since 1.0.0 * @since 1.0.0
*/ */
public const MODULE_ID = 1002700000; public const ID = 1002700000;
/** /**
* Providing. * Providing.

2
tests/Admin/AdminTest.php
View File

@ -19,7 +19,7 @@ namespace Modules\Helper\tests\Admin;
*/ */
class AdminTest extends \PHPUnit\Framework\TestCase class AdminTest extends \PHPUnit\Framework\TestCase
{ {
protected const MODULE_NAME = 'Helper'; protected const NAME = 'Helper';
protected const URI_LOAD = 'http://127.0.0.1/en/backend/helper'; protected const URI_LOAD = 'http://127.0.0.1/en/backend/helper';