Jingga/oms-Tasks
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Tasks.git synced 2026-02-16 06:38:40 +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:43 +02:00
parent 622a710378
commit 459d774b26
6 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Admin/Install/SearchCommands.php
View File

@ -22,7 +22,7 @@ return [
'dest' => '\Modules\Tasks\Controller\SearchController:searchTags', 'dest' => '\Modules\Tasks\Controller\SearchController:searchTags',
'verb' => RouteVerb::ANY, 'verb' => RouteVerb::ANY,
'permission' => [ 'permission' => [
'module' => SearchController::MODULE_NAME, 'module' => SearchController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
], ],
], ],

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

@ -23,7 +23,7 @@ return [
'dest' => '\Modules\Tasks\Controller\ApiController:apiTaskCreate', 'dest' => '\Modules\Tasks\Controller\ApiController:apiTaskCreate',
'verb' => RouteVerb::PUT, 'verb' => RouteVerb::PUT,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
'state' => PermissionState::TASK, 'state' => PermissionState::TASK,
], ],
@ -32,7 +32,7 @@ return [
'dest' => '\Modules\Tasks\Controller\ApiController:apiTaskSet', 'dest' => '\Modules\Tasks\Controller\ApiController:apiTaskSet',
'verb' => RouteVerb::SET, 'verb' => RouteVerb::SET,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::MODIFY, 'type' => PermissionType::MODIFY,
'state' => PermissionState::TASK, 'state' => PermissionState::TASK,
], ],
@ -41,7 +41,7 @@ return [
'dest' => '\Modules\Tasks\Controller\ApiController:apiTaskGet', 'dest' => '\Modules\Tasks\Controller\ApiController:apiTaskGet',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::TASK, 'state' => PermissionState::TASK,
], ],
@ -52,7 +52,7 @@ return [
'dest' => '\Modules\Tasks\Controller\ApiController:apiTaskElementCreate', 'dest' => '\Modules\Tasks\Controller\ApiController:apiTaskElementCreate',
'verb' => RouteVerb::PUT, 'verb' => RouteVerb::PUT,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
'state' => PermissionState::ELEMENT, 'state' => PermissionState::ELEMENT,
], ],
@ -61,7 +61,7 @@ return [
'dest' => '\Modules\Tasks\Controller\ApiController:apiTaskElementSet', 'dest' => '\Modules\Tasks\Controller\ApiController:apiTaskElementSet',
'verb' => RouteVerb::SET, 'verb' => RouteVerb::SET,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::MODIFY, 'type' => PermissionType::MODIFY,
'state' => PermissionState::ELEMENT, 'state' => PermissionState::ELEMENT,
], ],
@ -70,7 +70,7 @@ return [
'dest' => '\Modules\Tasks\Controller\ApiController:apiTaskElementGet', 'dest' => '\Modules\Tasks\Controller\ApiController:apiTaskElementGet',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::TASK, 'state' => PermissionState::TASK,
], ],

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

@ -23,7 +23,7 @@ return [
'dest' => '\Modules\Tasks\Controller\BackendController:viewTaskDashboard', 'dest' => '\Modules\Tasks\Controller\BackendController:viewTaskDashboard',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::TASK, 'state' => PermissionState::TASK,
], ],
@ -34,7 +34,7 @@ return [
'dest' => '\Modules\Tasks\Controller\BackendController:viewTaskView', 'dest' => '\Modules\Tasks\Controller\BackendController:viewTaskView',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::TASK, 'state' => PermissionState::TASK,
], ],
@ -45,7 +45,7 @@ return [
'dest' => '\Modules\Tasks\Controller\BackendController:viewTaskCreate', 'dest' => '\Modules\Tasks\Controller\BackendController:viewTaskCreate',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
'state' => PermissionState::TASK, 'state' => PermissionState::TASK,
], ],
@ -56,7 +56,7 @@ return [
'dest' => '\Modules\Tasks\Controller\BackendController:viewTaskAnalysis', 'dest' => '\Modules\Tasks\Controller\BackendController:viewTaskAnalysis',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::ANALYSIS, 'state' => PermissionState::ANALYSIS,
], ],

2
Controller/BackendController.php
View File

@ -142,7 +142,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::MODULE_NAME, PermissionState::TASK, $task->getId()) PermissionType::READ, $this->app->orgId, $this->app->appName, self::NAME, PermissionState::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;

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 = 'Tasks'; public const NAME = 'Tasks';
/** /**
* 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 = 1001100000; public const ID = 1001100000;
/** /**
* Providing. * Providing.

2
tests/Admin/AdminTest.php
View File

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