Jingga/oms-Script
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Script.git synced 2026-02-13 03:28:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

org -> unit change, some new functionality

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-01-26 21:54:13 +01:00
parent 60793d3a7b
commit 5a850e43d3
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Admin/Install/db.json
View File

@ -67,8 +67,8 @@
"name": "helper_template_unit", "name": "helper_template_unit",
"type": "INT", "type": "INT",
"null": true, "null": true,
"foreignTable": "organization_unit", "foreignTable": "unit",
"foreignKey": "organization_unit_id" "foreignKey": "unit_id"
}, },
"helper_template_created": { "helper_template_created": {
"name": "helper_template_created", "name": "helper_template_created",

12
Controller/ApiController.php
View File

@ -92,8 +92,8 @@ final class ApiController extends Controller
$isExport = \in_array($request->getData('type'), ['xlsx', 'pdf', 'docx', 'pptx', 'csv', 'json']); $isExport = \in_array($request->getData('type'), ['xlsx', 'pdf', 'docx', 'pptx', 'csv', 'json']);
// is allowed to read // is allowed to read
if (!$this->app->accountManager->get($accountId)->hasPermission(PermissionType::READ, $this->app->orgId, null, self::NAME, PermissionCategory::REPORT, $template->getId()) if (!$this->app->accountManager->get($accountId)->hasPermission(PermissionType::READ, $this->app->unitId, null, self::NAME, PermissionCategory::REPORT, $template->getId())
|| ($isExport && !$this->app->accountManager->get($accountId)->hasPermission(PermissionType::READ, $this->app->orgId, $this->app->appName, self::NAME, PermissionCategory::EXPORT)) || ($isExport && !$this->app->accountManager->get($accountId)->hasPermission(PermissionType::READ, $this->app->unitId, $this->app->appName, self::NAME, PermissionCategory::EXPORT))
) { ) {
$response->header->status = RequestStatusCode::R_403; $response->header->status = RequestStatusCode::R_403;
@ -409,7 +409,7 @@ final class ApiController extends Controller
} }
// is allowed to create // is allowed to create
if (!$this->app->accountManager->get($request->header->account)->hasPermission(PermissionType::CREATE, $this->app->orgId, null, self::NAME, PermissionCategory::TEMPLATE)) { if (!$this->app->accountManager->get($request->header->account)->hasPermission(PermissionType::CREATE, $this->app->unitId, null, self::NAME, PermissionCategory::TEMPLATE)) {
$response->header->status = RequestStatusCode::R_403; $response->header->status = RequestStatusCode::R_403;
return; return;
@ -465,7 +465,7 @@ final class ApiController extends Controller
$this->app->moduleManager->get('Admin')->createAccountModelPermission( $this->app->moduleManager->get('Admin')->createAccountModelPermission(
new AccountPermission( new AccountPermission(
$request->header->account, $request->header->account,
$this->app->orgId, $this->app->unitId,
$this->app->appName, $this->app->appName,
self::NAME, self::NAME,
self::NAME, self::NAME,
@ -579,7 +579,7 @@ final class ApiController extends Controller
} }
// is allowed to create // is allowed to create
if (!$this->app->accountManager->get($request->header->account)->hasPermission(PermissionType::CREATE, $this->app->orgId, null, self::NAME, PermissionCategory::REPORT)) { if (!$this->app->accountManager->get($request->header->account)->hasPermission(PermissionType::CREATE, $this->app->unitId, null, self::NAME, PermissionCategory::REPORT)) {
$response->header->status = RequestStatusCode::R_403; $response->header->status = RequestStatusCode::R_403;
return; return;
@ -617,7 +617,7 @@ final class ApiController extends Controller
$this->app->moduleManager->get('Admin')->createAccountModelPermission( $this->app->moduleManager->get('Admin')->createAccountModelPermission(
new AccountPermission( new AccountPermission(
$request->header->account, $request->header->account,
$this->app->orgId, $this->app->unitId,
$this->app->appName, $this->app->appName,
self::NAME, self::NAME,
self::NAME, self::NAME,

2
Controller/BackendController.php
View File

@ -224,7 +224,7 @@ final class BackendController extends Controller
$view->addData('rcoll', $rcoll); $view->addData('rcoll', $rcoll);
} }
$view->addData('unit', $this->app->orgId); $view->addData('unit', $this->app->unitId);
$view->addData('tcoll', $tcoll); $view->addData('tcoll', $tcoll);
$view->addData('lang', $request->getData('lang') ?? $request->getLanguage()); $view->addData('lang', $request->getData('lang') ?? $request->getLanguage());
$view->addData('template', $template); $view->addData('template', $template);

2
tests/Controller/ApiControllerTest.php
View File

@ -62,7 +62,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
}; };
$this->app->dbPool = $GLOBALS['dbpool']; $this->app->dbPool = $GLOBALS['dbpool'];
$this->app->orgId = 1; $this->app->unitId = 1;
$this->app->accountManager = new AccountManager($GLOBALS['session']); $this->app->accountManager = new AccountManager($GLOBALS['session']);
$this->app->appSettings = new CoreSettings(); $this->app->appSettings = new CoreSettings();
$this->app->moduleManager = new ModuleManager($this->app, __DIR__ . '/../../../../Modules/'); $this->app->moduleManager = new ModuleManager($this->app, __DIR__ . '/../../../../Modules/');

2
tests/ControllerTestTemp.php
View File

@ -46,7 +46,7 @@ class ControllerTest extends \PHPUnit\Framework\TestCase
}; };
$this->app->dbPool = $GLOBALS['dbpool']; $this->app->dbPool = $GLOBALS['dbpool'];
$this->app->orgId = 1; $this->app->unitId = 1;
$this->app->accountManager = new AccountManager($GLOBALS['session']); $this->app->accountManager = new AccountManager($GLOBALS['session']);
$this->app->appSettings = new CoreSettings(); $this->app->appSettings = new CoreSettings();
$this->app->moduleManager = new ModuleManager($this->app, __DIR__ . '/../../../Modules/'); $this->app->moduleManager = new ModuleManager($this->app, __DIR__ . '/../../../Modules/');