From fbed090251f315bc3a9e712288b169597f749da6 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Fri, 8 Dec 2023 21:52:33 +0000 Subject: [PATCH] bug fixes --- Controller/ApiAddressAttributeController.php | 4 ++-- Controller/ApiAttributeController.php | 4 ++-- Controller/ApiController.php | 4 ++-- ICAL.txt | 2 +- Models/Unit.php | 4 ++-- .../DepartmentTagSelector/department-selector-popup.tpl.php | 2 +- .../PositionTagSelector/position-selector-popup.tpl.php | 2 +- .../Components/UnitTagSelector/unit-selector-popup.tpl.php | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Controller/ApiAddressAttributeController.php b/Controller/ApiAddressAttributeController.php index f3bac2c..6bebdea 100644 --- a/Controller/ApiAddressAttributeController.php +++ b/Controller/ApiAddressAttributeController.php @@ -377,7 +377,7 @@ final class ApiAddressAttributeController extends Controller * * @api * - * @todo: implement + * @todo Implement API function * * @since 1.0.0 */ @@ -448,7 +448,7 @@ final class ApiAddressAttributeController extends Controller */ public function apiAddressAttributeValueDelete(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void { - // @todo: I don't think values can be deleted? Only Attributes + // @todo I don't think values can be deleted? Only Attributes // However, It should be possible to remove UNUSED default values // either here or other function? // if (!empty($val = $this->validateAttributeValueDelete($request))) { diff --git a/Controller/ApiAttributeController.php b/Controller/ApiAttributeController.php index 1e0e27b..f4ddaf2 100644 --- a/Controller/ApiAttributeController.php +++ b/Controller/ApiAttributeController.php @@ -377,7 +377,7 @@ final class ApiAttributeController extends Controller * * @api * - * @todo: implement + * @todo Implement API function * * @since 1.0.0 */ @@ -448,7 +448,7 @@ final class ApiAttributeController extends Controller */ public function apiUnitAttributeValueDelete(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void { - // @todo: I don't think values can be deleted? Only Attributes + // @todo I don't think values can be deleted? Only Attributes // However, It should be possible to remove UNUSED default values // either here or other function? // if (!empty($val = $this->validateAttributeValueDelete($request))) { diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 9f6d845..9c05ef1 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -16,9 +16,7 @@ namespace Modules\Organization\Controller; use Model\Setting; use Model\SettingMapper; -use Modules\Admin\Models\Address; use Modules\Admin\Models\AddressMapper; -use Modules\Admin\Models\NullAddress; use Modules\Admin\Models\SettingsEnum as ModelsSettingsEnum; use Modules\Media\Models\PathSettings; use Modules\Organization\Models\Department; @@ -39,6 +37,8 @@ use phpOMS\Message\Http\HttpResponse; use phpOMS\Message\Http\RequestStatusCode; use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; +use phpOMS\Stdlib\Base\Address; +use phpOMS\Stdlib\Base\NullAddress; use phpOMS\System\MimeType; use phpOMS\Utils\Parser\Markdown\Markdown; diff --git a/ICAL.txt b/ICAL.txt index 019045f..f1b55ed 100755 --- a/ICAL.txt +++ b/ICAL.txt @@ -1,6 +1,6 @@ # Individual Contributor License Agreement ("CLA") 1.0 -Thank you for your interest in Karaka-Management (the "Company"). In order to clarify the intellectual property license granted with Contributions from any person or entity, the Company must provide a Contributor License Agreement ("CLA") on file that has been made available to each Contributor. This license is for your protection as a Contributor as well as the protection of the Company and its users; it does not change your rights to use your own Contributions for any other purpose. +Thank you for your interest in Jingga e. K. (the "Company"). In order to clarify the intellectual property license granted with Contributions from any person or entity, the Company must provide a Contributor License Agreement ("CLA") on file that has been made available to each Contributor. This license is for your protection as a Contributor as well as the protection of the Company and its users; it does not change your rights to use your own Contributions for any other purpose. By contributing to the Company You accept and agree to the following terms and conditions for Your present and future Contributions submitted to the Company. In return, the Company shall not use Your Contributions in a way that is contrary to the public benefit or inconsistent with its bylaws in effect at the time of the Contribution. Except for the license granted herein to the Company and recipients of software distributed by the Company, You reserve all right, title, and interest in and to Your Contributions. diff --git a/Models/Unit.php b/Models/Unit.php index 30443c0..c0aa5ba 100755 --- a/Models/Unit.php +++ b/Models/Unit.php @@ -14,10 +14,10 @@ declare(strict_types=1); namespace Modules\Organization\Models; -use Modules\Admin\Models\Address; -use Modules\Admin\Models\NullAddress; use Modules\Media\Models\Media; use Modules\Media\Models\NullMedia; +use phpOMS\Stdlib\Base\Address; +use phpOMS\Stdlib\Base\NullAddress; /** * Organization unit class. diff --git a/Theme/Backend/Components/DepartmentTagSelector/department-selector-popup.tpl.php b/Theme/Backend/Components/DepartmentTagSelector/department-selector-popup.tpl.php index 1d3658f..2ff6f58 100755 --- a/Theme/Backend/Components/DepartmentTagSelector/department-selector-popup.tpl.php +++ b/Theme/Backend/Components/DepartmentTagSelector/department-selector-popup.tpl.php @@ -23,7 +23,7 @@ City Zip Country - + City Zip Country - +