mirror of
https://github.com/Karaka-Management/oms-HumanResourceTimeRecording.git
synced 2026-02-10 09:58:40 +00:00
rename module constants and fix some unit test bugs
This commit is contained in:
parent
41902316a5
commit
350681da34
|
|
@ -23,7 +23,7 @@ return [
|
||||||
'dest' => '\Modules\HumanResourceTimeRecording\Controller\ApiController:apiSessionCreate',
|
'dest' => '\Modules\HumanResourceTimeRecording\Controller\ApiController:apiSessionCreate',
|
||||||
'verb' => RouteVerb::PUT,
|
'verb' => RouteVerb::PUT,
|
||||||
'permission' => [
|
'permission' => [
|
||||||
'module' => ApiController::MODULE_NAME,
|
'module' => ApiController::NAME,
|
||||||
'type' => PermissionType::CREATE,
|
'type' => PermissionType::CREATE,
|
||||||
'state' => PermissionState::SESSION,
|
'state' => PermissionState::SESSION,
|
||||||
],
|
],
|
||||||
|
|
@ -34,7 +34,7 @@ return [
|
||||||
'dest' => '\Modules\HumanResourceTimeRecording\Controller\ApiController:apiSessionElementCreate',
|
'dest' => '\Modules\HumanResourceTimeRecording\Controller\ApiController:apiSessionElementCreate',
|
||||||
'verb' => RouteVerb::PUT,
|
'verb' => RouteVerb::PUT,
|
||||||
'permission' => [
|
'permission' => [
|
||||||
'module' => ApiController::MODULE_NAME,
|
'module' => ApiController::NAME,
|
||||||
'type' => PermissionType::CREATE,
|
'type' => PermissionType::CREATE,
|
||||||
'state' => PermissionState::SESSION_ELEMENT,
|
'state' => PermissionState::SESSION_ELEMENT,
|
||||||
],
|
],
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@ return [
|
||||||
'dest' => '\Modules\HumanResourceTimeRecording\Controller\BackendController:viewDashboard',
|
'dest' => '\Modules\HumanResourceTimeRecording\Controller\BackendController:viewDashboard',
|
||||||
'verb' => RouteVerb::GET,
|
'verb' => RouteVerb::GET,
|
||||||
'permission' => [
|
'permission' => [
|
||||||
'module' => BackendController::MODULE_NAME,
|
'module' => BackendController::NAME,
|
||||||
'type' => PermissionType::READ,
|
'type' => PermissionType::READ,
|
||||||
'state' => PermissionState::DASHBOARD,
|
'state' => PermissionState::DASHBOARD,
|
||||||
],
|
],
|
||||||
|
|
@ -34,7 +34,7 @@ return [
|
||||||
'dest' => '\Modules\HumanResourceTimeRecording\Controller\BackendController:viewPrivateDashboard',
|
'dest' => '\Modules\HumanResourceTimeRecording\Controller\BackendController:viewPrivateDashboard',
|
||||||
'verb' => RouteVerb::GET,
|
'verb' => RouteVerb::GET,
|
||||||
'permission' => [
|
'permission' => [
|
||||||
'module' => BackendController::MODULE_NAME,
|
'module' => BackendController::NAME,
|
||||||
'type' => PermissionType::READ,
|
'type' => PermissionType::READ,
|
||||||
'state' => PermissionState::PRIVATE_DASHBOARD,
|
'state' => PermissionState::PRIVATE_DASHBOARD,
|
||||||
],
|
],
|
||||||
|
|
@ -45,7 +45,7 @@ return [
|
||||||
'dest' => '\Modules\HumanResourceTimeRecording\Controller\BackendController:viewPrivateSession',
|
'dest' => '\Modules\HumanResourceTimeRecording\Controller\BackendController:viewPrivateSession',
|
||||||
'verb' => RouteVerb::GET,
|
'verb' => RouteVerb::GET,
|
||||||
'permission' => [
|
'permission' => [
|
||||||
'module' => BackendController::MODULE_NAME,
|
'module' => BackendController::NAME,
|
||||||
'type' => PermissionType::READ,
|
'type' => PermissionType::READ,
|
||||||
'state' => PermissionState::PRIVATE_DASHBOARD,
|
'state' => PermissionState::PRIVATE_DASHBOARD,
|
||||||
],
|
],
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ return [
|
||||||
'dest' => '\Modules\HumanResourceTimeRecording\Controller\TimerecordingController:viewDashboard',
|
'dest' => '\Modules\HumanResourceTimeRecording\Controller\TimerecordingController:viewDashboard',
|
||||||
'verb' => RouteVerb::GET,
|
'verb' => RouteVerb::GET,
|
||||||
'permission' => [
|
'permission' => [
|
||||||
'module' => TimerecordingController::MODULE_NAME,
|
'module' => TimerecordingController::NAME,
|
||||||
'type' => PermissionType::READ,
|
'type' => PermissionType::READ,
|
||||||
'state' => PermissionState::DASHBOARD,
|
'state' => PermissionState::DASHBOARD,
|
||||||
],
|
],
|
||||||
|
|
@ -22,7 +22,7 @@ return [
|
||||||
'dest' => '\Modules\HumanResourceTimeRecording\Controller\TimerecordingController:viewDashboard',
|
'dest' => '\Modules\HumanResourceTimeRecording\Controller\TimerecordingController:viewDashboard',
|
||||||
'verb' => RouteVerb::GET,
|
'verb' => RouteVerb::GET,
|
||||||
'permission' => [
|
'permission' => [
|
||||||
'module' => TimerecordingController::MODULE_NAME,
|
'module' => TimerecordingController::NAME,
|
||||||
'type' => PermissionType::READ,
|
'type' => PermissionType::READ,
|
||||||
'state' => PermissionState::DASHBOARD,
|
'state' => PermissionState::DASHBOARD,
|
||||||
],
|
],
|
||||||
|
|
|
||||||
|
|
@ -62,7 +62,7 @@ final class ApiController extends Controller
|
||||||
|
|
||||||
if ($request->getData('account') !== null) {
|
if ($request->getData('account') !== null) {
|
||||||
if (!$this->app->accountManager->get($request->header->account)->hasPermission(
|
if (!$this->app->accountManager->get($request->header->account)->hasPermission(
|
||||||
PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::SESSION_FOREIGN
|
PermissionType::READ, $this->app->orgId, $this->app->appName, self::NAME, PermissionState::SESSION_FOREIGN
|
||||||
)) {
|
)) {
|
||||||
$this->fillJsonResponse($request, $response, NotificationLevel::HIDDEN, '', '', []);
|
$this->fillJsonResponse($request, $response, NotificationLevel::HIDDEN, '', '', []);
|
||||||
}
|
}
|
||||||
|
|
@ -115,7 +115,7 @@ final class ApiController extends Controller
|
||||||
|
|
||||||
if ($request->getData('account') !== null) {
|
if ($request->getData('account') !== null) {
|
||||||
if (!$this->app->accountManager->get($request->header->account)->hasPermission(
|
if (!$this->app->accountManager->get($request->header->account)->hasPermission(
|
||||||
PermissionType::CREATE, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::SESSION_FOREIGN
|
PermissionType::CREATE, $this->app->orgId, $this->app->appName, self::NAME, PermissionState::SESSION_FOREIGN
|
||||||
)) {
|
)) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
@ -245,7 +245,7 @@ final class ApiController extends Controller
|
||||||
|| $session->getEmployee()->profile->account->getId() !== $request->header->account
|
|| $session->getEmployee()->profile->account->getId() !== $request->header->account
|
||||||
) {
|
) {
|
||||||
if (!$this->app->accountManager->get($request->header->account)->hasPermission(
|
if (!$this->app->accountManager->get($request->header->account)->hasPermission(
|
||||||
PermissionType::CREATE, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::SESSION_ELEMENT_FOREIGN
|
PermissionType::CREATE, $this->app->orgId, $this->app->appName, self::NAME, PermissionState::SESSION_ELEMENT_FOREIGN
|
||||||
)) {
|
)) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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 = 'HumanResourceTimeRecording';
|
public const NAME = 'HumanResourceTimeRecording';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 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 = 1006300000;
|
public const ID = 1006300000;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Providing.
|
* Providing.
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@ namespace Modules\HumanResourceTimeRecording\tests\Admin;
|
||||||
*/
|
*/
|
||||||
class AdminTest extends \PHPUnit\Framework\TestCase
|
class AdminTest extends \PHPUnit\Framework\TestCase
|
||||||
{
|
{
|
||||||
protected const MODULE_NAME = 'HumanResourceTimeRecording';
|
protected const NAME = 'HumanResourceTimeRecording';
|
||||||
|
|
||||||
protected const URI_LOAD = '';
|
protected const URI_LOAD = '';
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user