From 9855b02278d2f0e529b7516f2210d010b202ba3b Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Tue, 2 Jan 2024 23:34:18 +0000 Subject: [PATCH] update --- Admin/Install/unit_attributes.json | 13 ++++++++++++ Admin/Installer.php | 4 ++-- Controller/ApiController.php | 2 +- Controller/BackendController.php | 20 +++++++++---------- Models/PermissionCategory.php | 2 +- .../department-selector.tpl.php | 2 +- .../position-selector.tpl.php | 2 +- .../UnitTagSelector/unit-selector.tpl.php | 2 +- tests/Models/DepartmentTest.php | 2 +- tests/Models/PositionTest.php | 2 +- tests/Models/UnitTest.php | 2 +- 11 files changed, 33 insertions(+), 20 deletions(-) diff --git a/Admin/Install/unit_attributes.json b/Admin/Install/unit_attributes.json index 3d7d76e..4d6b349 100644 --- a/Admin/Install/unit_attributes.json +++ b/Admin/Install/unit_attributes.json @@ -24,5 +24,18 @@ "is_required": false, "default_value": "", "values": [] + }, + { + "name": "business_year_start", + "l11n": { + "en": "Business year start", + "de": "Geschäftsjahresbeginn" + }, + "value_type": 1, + "is_custom_allowed": true, + "validation_pattern": "", + "is_required": false, + "default_value": "", + "values": [] } ] \ No newline at end of file diff --git a/Admin/Installer.php b/Admin/Installer.php index 7425c77..d010420 100755 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -49,8 +49,6 @@ final class Installer extends InstallerAbstract { parent::install($app, $info, $cfgHandler); - self::installDefaultUnit(); - /* Unit Attributes */ $fileContent = \file_get_contents(__DIR__ . '/Install/unit_attributes.json'); if ($fileContent === false) { @@ -78,6 +76,8 @@ final class Installer extends InstallerAbstract $attrTypes = self::createAddressAttributeTypes($app, $attributes); $attrValues = self::createAddressAttributeValues($app, $attrTypes, $attributes); + + self::installDefaultUnit(); } /** diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 9c05ef1..fd86b7c 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -363,7 +363,7 @@ final class ApiController extends Controller } /** - * Routing end-point for application behaviour. + * Routing end-point for application behavior. * * @param RequestAbstract $request Request * @param ResponseAbstract $response Response diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 4febbd0..6260705 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -38,7 +38,7 @@ use phpOMS\Views\View; final class BackendController extends Controller { /** - * Routing end-point for application behaviour. + * Routing end-point for application behavior. * * @param RequestAbstract $request Request * @param ResponseAbstract $response Response @@ -73,7 +73,7 @@ final class BackendController extends Controller } /** - * Routing end-point for application behaviour. + * Routing end-point for application behavior. * * @param RequestAbstract $request Request * @param ResponseAbstract $response Response @@ -110,7 +110,7 @@ final class BackendController extends Controller } /** - * Routing end-point for application behaviour. + * Routing end-point for application behavior. * * @param RequestAbstract $request Request * @param ResponseAbstract $response Response @@ -180,7 +180,7 @@ final class BackendController extends Controller } /** - * Routing end-point for application behaviour. + * Routing end-point for application behavior. * * @param RequestAbstract $request Request * @param ResponseAbstract $response Response @@ -211,7 +211,7 @@ final class BackendController extends Controller } /** - * Routing end-point for application behaviour. + * Routing end-point for application behavior. * * @param RequestAbstract $request Request * @param ResponseAbstract $response Response @@ -256,7 +256,7 @@ final class BackendController extends Controller } /** - * Routing end-point for application behaviour. + * Routing end-point for application behavior. * * @param RequestAbstract $request Request * @param ResponseAbstract $response Response @@ -289,7 +289,7 @@ final class BackendController extends Controller } /** - * Routing end-point for application behaviour. + * Routing end-point for application behavior. * * @param RequestAbstract $request Request * @param ResponseAbstract $response Response @@ -320,7 +320,7 @@ final class BackendController extends Controller } /** - * Routing end-point for application behaviour. + * Routing end-point for application behavior. * * @param RequestAbstract $request Request * @param ResponseAbstract $response Response @@ -350,7 +350,7 @@ final class BackendController extends Controller } /** - * Routing end-point for application behaviour. + * Routing end-point for application behavior. * * @param RequestAbstract $request Request * @param ResponseAbstract $response Response @@ -383,7 +383,7 @@ final class BackendController extends Controller } /** - * Routing end-point for application behaviour. + * Routing end-point for application behavior. * * @param RequestAbstract $request Request * @param ResponseAbstract $response Response diff --git a/Models/PermissionCategory.php b/Models/PermissionCategory.php index fbdc98a..170ac55 100755 --- a/Models/PermissionCategory.php +++ b/Models/PermissionCategory.php @@ -17,7 +17,7 @@ namespace Modules\Organization\Models; use phpOMS\Stdlib\Base\Enum; /** - * Permision state enum. + * Permission category enum. * * @package Modules\Organization\Models * @license OMS License 2.0 diff --git a/Theme/Backend/Components/DepartmentTagSelector/department-selector.tpl.php b/Theme/Backend/Components/DepartmentTagSelector/department-selector.tpl.php index 7a55240..468214e 100755 --- a/Theme/Backend/Components/DepartmentTagSelector/department-selector.tpl.php +++ b/Theme/Backend/Components/DepartmentTagSelector/department-selector.tpl.php @@ -18,7 +18,7 @@ data-autocomplete="off" data-src="api/organization/find/department?search={!#iid; ?>}">