diff --git a/Admin/Install/SearchCommands.php b/Admin/Install/SearchCommands.php index ad0ab4c..a91012d 100755 --- a/Admin/Install/SearchCommands.php +++ b/Admin/Install/SearchCommands.php @@ -22,7 +22,7 @@ return [ 'dest' => '\Modules\Tasks\Controller\SearchController:searchTags', 'verb' => RouteVerb::ANY, 'permission' => [ - 'module' => SearchController::MODULE_NAME, + 'module' => SearchController::NAME, 'type' => PermissionType::READ, ], ], diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php index 825dc7a..bc92ed3 100755 --- a/Admin/Routes/Web/Api.php +++ b/Admin/Routes/Web/Api.php @@ -23,7 +23,7 @@ return [ 'dest' => '\Modules\Tasks\Controller\ApiController:apiTaskCreate', 'verb' => RouteVerb::PUT, 'permission' => [ - 'module' => ApiController::MODULE_NAME, + 'module' => ApiController::NAME, 'type' => PermissionType::CREATE, 'state' => PermissionState::TASK, ], @@ -32,7 +32,7 @@ return [ 'dest' => '\Modules\Tasks\Controller\ApiController:apiTaskSet', 'verb' => RouteVerb::SET, 'permission' => [ - 'module' => ApiController::MODULE_NAME, + 'module' => ApiController::NAME, 'type' => PermissionType::MODIFY, 'state' => PermissionState::TASK, ], @@ -41,7 +41,7 @@ return [ 'dest' => '\Modules\Tasks\Controller\ApiController:apiTaskGet', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => ApiController::MODULE_NAME, + 'module' => ApiController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::TASK, ], @@ -52,7 +52,7 @@ return [ 'dest' => '\Modules\Tasks\Controller\ApiController:apiTaskElementCreate', 'verb' => RouteVerb::PUT, 'permission' => [ - 'module' => ApiController::MODULE_NAME, + 'module' => ApiController::NAME, 'type' => PermissionType::CREATE, 'state' => PermissionState::ELEMENT, ], @@ -61,7 +61,7 @@ return [ 'dest' => '\Modules\Tasks\Controller\ApiController:apiTaskElementSet', 'verb' => RouteVerb::SET, 'permission' => [ - 'module' => ApiController::MODULE_NAME, + 'module' => ApiController::NAME, 'type' => PermissionType::MODIFY, 'state' => PermissionState::ELEMENT, ], @@ -70,7 +70,7 @@ return [ 'dest' => '\Modules\Tasks\Controller\ApiController:apiTaskElementGet', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => ApiController::MODULE_NAME, + 'module' => ApiController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::TASK, ], diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index ab0ac89..e4f8727 100755 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -23,7 +23,7 @@ return [ 'dest' => '\Modules\Tasks\Controller\BackendController:viewTaskDashboard', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::TASK, ], @@ -34,7 +34,7 @@ return [ 'dest' => '\Modules\Tasks\Controller\BackendController:viewTaskView', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::TASK, ], @@ -45,7 +45,7 @@ return [ 'dest' => '\Modules\Tasks\Controller\BackendController:viewTaskCreate', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::CREATE, 'state' => PermissionState::TASK, ], @@ -56,7 +56,7 @@ return [ 'dest' => '\Modules\Tasks\Controller\BackendController:viewTaskAnalysis', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::ANALYSIS, ], diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 62b7d5c..b5b2914 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -142,7 +142,7 @@ final class BackendController extends Controller implements DashboardElementInte || $task->isCCAccount($accountId) || $task->isToAccount($accountId)) && !$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'); $response->header->status = RequestStatusCode::R_403; diff --git a/Controller/Controller.php b/Controller/Controller.php index 642ecb0..2b5b5ae 100755 --- a/Controller/Controller.php +++ b/Controller/Controller.php @@ -32,7 +32,7 @@ class Controller extends ModuleAbstract * @var string * @since 1.0.0 */ - public const MODULE_PATH = __DIR__ . '/../'; + public const PATH = __DIR__ . '/../'; /** * Module version. @@ -40,7 +40,7 @@ class Controller extends ModuleAbstract * @var string * @since 1.0.0 */ - public const MODULE_VERSION = '1.0.0'; + public const VERSION = '1.0.0'; /** * Module name. @@ -48,7 +48,7 @@ class Controller extends ModuleAbstract * @var string * @since 1.0.0 */ - public const MODULE_NAME = 'Tasks'; + public const NAME = 'Tasks'; /** * Module id. @@ -56,7 +56,7 @@ class Controller extends ModuleAbstract * @var int * @since 1.0.0 */ - public const MODULE_ID = 1001100000; + public const ID = 1001100000; /** * Providing. diff --git a/tests/Admin/AdminTest.php b/tests/Admin/AdminTest.php index cd672d6..042cc7d 100755 --- a/tests/Admin/AdminTest.php +++ b/tests/Admin/AdminTest.php @@ -19,7 +19,7 @@ namespace Modules\Tasks\tests\Admin; */ 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';