Jingga/oms-News
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-News.git synced 2026-02-17 17:08: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 f41638aa1d
commit df15a0f14a
5 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,7 +23,7 @@ return [
'dest' => '\Modules\News\Controller\ApiController:apiNewsCreate', 'dest' => '\Modules\News\Controller\ApiController:apiNewsCreate',
'verb' => RouteVerb::PUT, 'verb' => RouteVerb::PUT,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
'state' => PermissionState::NEWS, 'state' => PermissionState::NEWS,
], ],
@ -32,7 +32,7 @@ return [
'dest' => '\Modules\News\Controller\ApiController:apiNewsUpdate', 'dest' => '\Modules\News\Controller\ApiController:apiNewsUpdate',
'verb' => RouteVerb::SET, 'verb' => RouteVerb::SET,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::MODIFY, 'type' => PermissionType::MODIFY,
'state' => PermissionState::NEWS, 'state' => PermissionState::NEWS,
], ],
@ -41,7 +41,7 @@ return [
'dest' => '\Modules\News\Controller\ApiController:apiNewsGet', 'dest' => '\Modules\News\Controller\ApiController:apiNewsGet',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::NEWS, 'state' => PermissionState::NEWS,
], ],
@ -50,7 +50,7 @@ return [
'dest' => '\Modules\News\Controller\ApiController:apiNewsDelete', 'dest' => '\Modules\News\Controller\ApiController:apiNewsDelete',
'verb' => RouteVerb::DELETE, 'verb' => RouteVerb::DELETE,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::DELETE, 'type' => PermissionType::DELETE,
'state' => PermissionState::NEWS, 'state' => PermissionState::NEWS,
], ],

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

@ -23,7 +23,7 @@ return [
'dest' => '\Modules\News\Controller\BackendController:viewNewsDashboard', 'dest' => '\Modules\News\Controller\BackendController:viewNewsDashboard',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::NEWS, 'state' => PermissionState::NEWS,
], ],
@ -34,7 +34,7 @@ return [
'dest' => '\Modules\News\Controller\BackendController:viewNewsArticle', 'dest' => '\Modules\News\Controller\BackendController:viewNewsArticle',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::NEWS, 'state' => PermissionState::NEWS,
], ],
@ -45,7 +45,7 @@ return [
'dest' => '\Modules\News\Controller\BackendController:viewNewsArchive', 'dest' => '\Modules\News\Controller\BackendController:viewNewsArchive',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::NEWS, 'state' => PermissionState::NEWS,
], ],
@ -56,7 +56,7 @@ return [
'dest' => '\Modules\News\Controller\BackendController:viewNewsDraftList', 'dest' => '\Modules\News\Controller\BackendController:viewNewsDraftList',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::MODIFY, 'type' => PermissionType::MODIFY,
'state' => PermissionState::NEWS, 'state' => PermissionState::NEWS,
], ],
@ -67,7 +67,7 @@ return [
'dest' => '\Modules\News\Controller\BackendController:viewNewsCreate', 'dest' => '\Modules\News\Controller\BackendController:viewNewsCreate',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
'state' => PermissionState::NEWS, 'state' => PermissionState::NEWS,
], ],
@ -78,7 +78,7 @@ return [
'dest' => '\Modules\News\Controller\BackendController:viewNewsEdit', 'dest' => '\Modules\News\Controller\BackendController:viewNewsEdit',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::MODIFY, 'type' => PermissionType::MODIFY,
'state' => PermissionState::NEWS, 'state' => PermissionState::NEWS,
], ],
@ -89,7 +89,7 @@ return [
'dest' => '\Modules\News\Controller\BackendController:viewNewsAnalysis', 'dest' => '\Modules\News\Controller\BackendController:viewNewsAnalysis',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::MODIFY, 'type' => PermissionType::MODIFY,
'state' => PermissionState::ANALYSIS, 'state' => PermissionState::ANALYSIS,
], ],

4
Controller/BackendController.php
View File

@ -145,7 +145,7 @@ final class BackendController extends Controller implements DashboardElementInte
if ($article->createdBy->getId() !== $accountId if ($article->createdBy->getId() !== $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::NEWS, $article->getId()) PermissionType::READ, $this->app->orgId, $this->app->appName, self::NAME, PermissionState::NEWS, $article->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;
@ -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('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000601001, $request, $response));
$view->addData('news', $article); $view->addData('news', $article);
$view->addData('editable', $this->app->accountManager->get($accountId)->hasPermission( $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 // allow comments

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

2
tests/Admin/AdminTest.php
View File

@ -19,7 +19,7 @@ namespace Modules\News\tests\Admin;
*/ */
class AdminTest extends \PHPUnit\Framework\TestCase 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'; protected const URI_LOAD = 'http://127.0.0.1/en/backend/news';