Jingga/oms-Organization
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Organization.git synced 2026-02-14 07:18:42 +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 6aa9d99b3c
commit 684b2616ce
5 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Admin/Install/Admin.install.php
View File

@ -20,18 +20,18 @@ return [
'type' => 'setting', 'type' => 'setting',
'name' => SettingsEnum::GROUP_GENERATE_AUTOMATICALLY_UNIT, 'name' => SettingsEnum::GROUP_GENERATE_AUTOMATICALLY_UNIT,
'content' => '1', 'content' => '1',
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
], ],
[ [
'type' => 'setting', 'type' => 'setting',
'name' => SettingsEnum::GROUP_GENERATE_AUTOMATICALLY_DEPARTMENT, 'name' => SettingsEnum::GROUP_GENERATE_AUTOMATICALLY_DEPARTMENT,
'content' => '1', 'content' => '1',
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
], ],
[ [
'type' => 'setting', 'type' => 'setting',
'name' => SettingsEnum::GROUP_GENERATE_AUTOMATICALLY_POSITION, 'name' => SettingsEnum::GROUP_GENERATE_AUTOMATICALLY_POSITION,
'content' => '1', 'content' => '1',
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
], ],
]; ];

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

@ -23,7 +23,7 @@ return [
'dest' => '\Modules\Organization\Controller\ApiController:apiPositionCreate', 'dest' => '\Modules\Organization\Controller\ApiController:apiPositionCreate',
'verb' => RouteVerb::PUT, 'verb' => RouteVerb::PUT,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
'state' => PermissionState::POSITION, 'state' => PermissionState::POSITION,
], ],
@ -32,7 +32,7 @@ return [
'dest' => '\Modules\Organization\Controller\ApiController:apiPositionGet', 'dest' => '\Modules\Organization\Controller\ApiController:apiPositionGet',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::POSITION, 'state' => PermissionState::POSITION,
], ],
@ -41,7 +41,7 @@ return [
'dest' => '\Modules\Organization\Controller\ApiController:apiPositionSet', 'dest' => '\Modules\Organization\Controller\ApiController:apiPositionSet',
'verb' => RouteVerb::SET, 'verb' => RouteVerb::SET,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::MODIFY, 'type' => PermissionType::MODIFY,
'state' => PermissionState::POSITION, 'state' => PermissionState::POSITION,
], ],
@ -50,7 +50,7 @@ return [
'dest' => '\Modules\Organization\Controller\ApiController:apiPositionDelete', 'dest' => '\Modules\Organization\Controller\ApiController:apiPositionDelete',
'verb' => RouteVerb::DELETE, 'verb' => RouteVerb::DELETE,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::DELETE, 'type' => PermissionType::DELETE,
'state' => PermissionState::POSITION, 'state' => PermissionState::POSITION,
], ],
@ -61,7 +61,7 @@ return [
'dest' => '\Modules\Organization\Controller\ApiController:apiDepartmentCreate', 'dest' => '\Modules\Organization\Controller\ApiController:apiDepartmentCreate',
'verb' => RouteVerb::PUT, 'verb' => RouteVerb::PUT,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
'state' => PermissionState::DEPARTMENT, 'state' => PermissionState::DEPARTMENT,
], ],
@ -70,7 +70,7 @@ return [
'dest' => '\Modules\Organization\Controller\ApiController:apiDepartmentGet', 'dest' => '\Modules\Organization\Controller\ApiController:apiDepartmentGet',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::DEPARTMENT, 'state' => PermissionState::DEPARTMENT,
], ],
@ -79,7 +79,7 @@ return [
'dest' => '\Modules\Organization\Controller\ApiController:apiDepartmentSet', 'dest' => '\Modules\Organization\Controller\ApiController:apiDepartmentSet',
'verb' => RouteVerb::SET, 'verb' => RouteVerb::SET,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::MODIFY, 'type' => PermissionType::MODIFY,
'state' => PermissionState::DEPARTMENT, 'state' => PermissionState::DEPARTMENT,
], ],
@ -88,7 +88,7 @@ return [
'dest' => '\Modules\Organization\Controller\ApiController:apiDepartmentDelete', 'dest' => '\Modules\Organization\Controller\ApiController:apiDepartmentDelete',
'verb' => RouteVerb::DELETE, 'verb' => RouteVerb::DELETE,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::DELETE, 'type' => PermissionType::DELETE,
'state' => PermissionState::DEPARTMENT, 'state' => PermissionState::DEPARTMENT,
], ],
@ -99,7 +99,7 @@ return [
'dest' => '\Modules\Organization\Controller\ApiController:apiUnitCreate', 'dest' => '\Modules\Organization\Controller\ApiController:apiUnitCreate',
'verb' => RouteVerb::PUT, 'verb' => RouteVerb::PUT,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
'state' => PermissionState::UNIT, 'state' => PermissionState::UNIT,
], ],
@ -108,7 +108,7 @@ return [
'dest' => '\Modules\Organization\Controller\ApiController:apiUnitGet', 'dest' => '\Modules\Organization\Controller\ApiController:apiUnitGet',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::UNIT, 'state' => PermissionState::UNIT,
], ],
@ -117,7 +117,7 @@ return [
'dest' => '\Modules\Organization\Controller\ApiController:apiUnitSet', 'dest' => '\Modules\Organization\Controller\ApiController:apiUnitSet',
'verb' => RouteVerb::SET, 'verb' => RouteVerb::SET,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::MODIFY, 'type' => PermissionType::MODIFY,
'state' => PermissionState::UNIT, 'state' => PermissionState::UNIT,
], ],
@ -126,7 +126,7 @@ return [
'dest' => '\Modules\Organization\Controller\ApiController:apiUnitDelete', 'dest' => '\Modules\Organization\Controller\ApiController:apiUnitDelete',
'verb' => RouteVerb::DELETE, 'verb' => RouteVerb::DELETE,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
'state' => PermissionState::UNIT, 'state' => PermissionState::UNIT,
], ],
@ -138,7 +138,7 @@ return [
'dest' => '\Modules\Organization\Controller\ApiController:apiUnitImageSet', 'dest' => '\Modules\Organization\Controller\ApiController:apiUnitImageSet',
'verb' => RouteVerb::SET, 'verb' => RouteVerb::SET,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::MODIFY, 'type' => PermissionType::MODIFY,
'state' => PermissionState::UNIT, 'state' => PermissionState::UNIT,
], ],
@ -150,7 +150,7 @@ return [
'dest' => '\Modules\Organization\Controller\ApiController:apiUnitFind', 'dest' => '\Modules\Organization\Controller\ApiController:apiUnitFind',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::UNIT, 'state' => PermissionState::UNIT,
], ],
@ -161,7 +161,7 @@ return [
'dest' => '\Modules\Organization\Controller\ApiController:apiDepartmentFind', 'dest' => '\Modules\Organization\Controller\ApiController:apiDepartmentFind',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::DEPARTMENT, 'state' => PermissionState::DEPARTMENT,
], ],
@ -172,7 +172,7 @@ return [
'dest' => '\Modules\Organization\Controller\ApiController:apiPositionFind', 'dest' => '\Modules\Organization\Controller\ApiController:apiPositionFind',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::POSITION, 'state' => PermissionState::POSITION,
], ],

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

@ -23,7 +23,7 @@ return [
'dest' => '\Modules\Organization\Controller\BackendController:viewOrganigram', 'dest' => '\Modules\Organization\Controller\BackendController:viewOrganigram',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::ORGANIGRAM, 'state' => PermissionState::ORGANIGRAM,
], ],
@ -34,7 +34,7 @@ return [
'dest' => '\Modules\Organization\Controller\BackendController:viewUnitList', 'dest' => '\Modules\Organization\Controller\BackendController:viewUnitList',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::UNIT, 'state' => PermissionState::UNIT,
], ],
@ -45,7 +45,7 @@ return [
'dest' => '\Modules\Organization\Controller\BackendController:viewUnitProfile', 'dest' => '\Modules\Organization\Controller\BackendController:viewUnitProfile',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::UNIT, 'state' => PermissionState::UNIT,
], ],
@ -56,7 +56,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::UNIT, 'state' => PermissionState::UNIT,
], ],
@ -65,7 +65,7 @@ return [
'dest' => '\Modules\Organization\Controller\BackendController:viewUnitCreate', 'dest' => '\Modules\Organization\Controller\BackendController:viewUnitCreate',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
'state' => PermissionState::UNIT, 'state' => PermissionState::UNIT,
], ],
@ -76,7 +76,7 @@ return [
'dest' => '\Modules\Organization\Controller\BackendController:viewDepartmentList', 'dest' => '\Modules\Organization\Controller\BackendController:viewDepartmentList',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::DEPARTMENT, 'state' => PermissionState::DEPARTMENT,
], ],
@ -87,7 +87,7 @@ return [
'dest' => '\Modules\Organization\Controller\BackendController:viewDepartmentProfile', 'dest' => '\Modules\Organization\Controller\BackendController:viewDepartmentProfile',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::DEPARTMENT, 'state' => PermissionState::DEPARTMENT,
], ],
@ -98,7 +98,7 @@ return [
'dest' => '\Modules\Organization\Controller\BackendController:viewDepartmentCreate', 'dest' => '\Modules\Organization\Controller\BackendController:viewDepartmentCreate',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
'state' => PermissionState::DEPARTMENT, 'state' => PermissionState::DEPARTMENT,
], ],
@ -109,7 +109,7 @@ return [
'dest' => '\Modules\Organization\Controller\BackendController:viewPositionList', 'dest' => '\Modules\Organization\Controller\BackendController:viewPositionList',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::POSITION, 'state' => PermissionState::POSITION,
], ],
@ -120,7 +120,7 @@ return [
'dest' => '\Modules\Organization\Controller\BackendController:viewPositionProfile', 'dest' => '\Modules\Organization\Controller\BackendController:viewPositionProfile',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::POSITION, 'state' => PermissionState::POSITION,
], ],
@ -131,7 +131,7 @@ return [
'dest' => '\Modules\Organization\Controller\BackendController:viewPositionCreate', 'dest' => '\Modules\Organization\Controller\BackendController:viewPositionCreate',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
'state' => PermissionState::POSITION, 'state' => PermissionState::POSITION,
], ],

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

2
tests/Admin/AdminTest.php
View File

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