diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php index da37051..b98a7d4 100755 --- a/Admin/Routes/Web/Api.php +++ b/Admin/Routes/Web/Api.php @@ -23,7 +23,7 @@ return [ 'dest' => '\Modules\News\Controller\ApiController:apiNewsCreate', 'verb' => RouteVerb::PUT, 'permission' => [ - 'module' => ApiController::MODULE_NAME, + 'module' => ApiController::NAME, 'type' => PermissionType::CREATE, 'state' => PermissionState::NEWS, ], @@ -32,7 +32,7 @@ return [ 'dest' => '\Modules\News\Controller\ApiController:apiNewsUpdate', 'verb' => RouteVerb::SET, 'permission' => [ - 'module' => ApiController::MODULE_NAME, + 'module' => ApiController::NAME, 'type' => PermissionType::MODIFY, 'state' => PermissionState::NEWS, ], @@ -41,7 +41,7 @@ return [ 'dest' => '\Modules\News\Controller\ApiController:apiNewsGet', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => ApiController::MODULE_NAME, + 'module' => ApiController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::NEWS, ], @@ -50,7 +50,7 @@ return [ 'dest' => '\Modules\News\Controller\ApiController:apiNewsDelete', 'verb' => RouteVerb::DELETE, 'permission' => [ - 'module' => ApiController::MODULE_NAME, + 'module' => ApiController::NAME, 'type' => PermissionType::DELETE, 'state' => PermissionState::NEWS, ], diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index f8630e0..49e0b03 100755 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -23,7 +23,7 @@ return [ 'dest' => '\Modules\News\Controller\BackendController:viewNewsDashboard', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::NEWS, ], @@ -34,7 +34,7 @@ return [ 'dest' => '\Modules\News\Controller\BackendController:viewNewsArticle', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::NEWS, ], @@ -45,7 +45,7 @@ return [ 'dest' => '\Modules\News\Controller\BackendController:viewNewsArchive', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::READ, 'state' => PermissionState::NEWS, ], @@ -56,7 +56,7 @@ return [ 'dest' => '\Modules\News\Controller\BackendController:viewNewsDraftList', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::MODIFY, 'state' => PermissionState::NEWS, ], @@ -67,7 +67,7 @@ return [ 'dest' => '\Modules\News\Controller\BackendController:viewNewsCreate', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::CREATE, 'state' => PermissionState::NEWS, ], @@ -78,7 +78,7 @@ return [ 'dest' => '\Modules\News\Controller\BackendController:viewNewsEdit', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::MODIFY, 'state' => PermissionState::NEWS, ], @@ -89,7 +89,7 @@ return [ 'dest' => '\Modules\News\Controller\BackendController:viewNewsAnalysis', 'verb' => RouteVerb::GET, 'permission' => [ - 'module' => BackendController::MODULE_NAME, + 'module' => BackendController::NAME, 'type' => PermissionType::MODIFY, 'state' => PermissionState::ANALYSIS, ], diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 63f91ef..699fcd3 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -145,7 +145,7 @@ final class BackendController extends Controller implements DashboardElementInte if ($article->createdBy->getId() !== $accountId && !$this->app->accountManager->get($accountId)->hasPermission( - PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::NEWS, $article->getId()) + PermissionType::READ, $this->app->orgId, $this->app->appName, self::NAME, PermissionState::NEWS, $article->getId()) ) { $view->setTemplate('/Web/Backend/Error/403_inline'); $response->header->status = RequestStatusCode::R_403; @@ -156,7 +156,7 @@ final class BackendController extends Controller implements DashboardElementInte $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000601001, $request, $response)); $view->addData('news', $article); $view->addData('editable', $this->app->accountManager->get($accountId)->hasPermission( - PermissionType::MODIFY, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::NEWS, $article->getId()) + PermissionType::MODIFY, $this->app->orgId, $this->app->appName, self::NAME, PermissionState::NEWS, $article->getId()) ); // allow comments diff --git a/Controller/Controller.php b/Controller/Controller.php index f9f4aa2..38effb1 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 = 'News'; + public const NAME = 'News'; /** * Module id. @@ -56,7 +56,7 @@ class Controller extends ModuleAbstract * @var int * @since 1.0.0 */ - public const MODULE_ID = 1000600000; + public const ID = 1000600000; /** * Providing. diff --git a/tests/Admin/AdminTest.php b/tests/Admin/AdminTest.php index b657f40..83d2413 100755 --- a/tests/Admin/AdminTest.php +++ b/tests/Admin/AdminTest.php @@ -19,7 +19,7 @@ namespace Modules\News\tests\Admin; */ class AdminTest extends \PHPUnit\Framework\TestCase { - protected const MODULE_NAME = 'News'; + protected const NAME = 'News'; protected const URI_LOAD = 'http://127.0.0.1/en/backend/news';