diff --git a/Controller/ApiController.php b/Controller/ApiController.php index f584a2b..d897c56 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -184,7 +184,9 @@ final class ApiController extends Controller $unit = $this->createUnitFromRequest($request); $this->createModel($request->header->account, $unit, UnitMapper::class, 'unit', $request->getOrigin()); - if ($this->app->appSettings->get(null, SettingsEnum::GROUP_GENERATE_AUTOMATICALLY_UNIT)->content === '1') { + /** @var \Model\Setting $setting */ + $setting = $this->app->appSettings->get(null, SettingsEnum::GROUP_GENERATE_AUTOMATICALLY_UNIT); + if ($setting->content === '1') { $newRequest = new HttpRequest(); $newRequest->header->account = $request->header->account; $newRequest->setData('name', 'org:unit:' . \strtolower($unit->name)); @@ -403,7 +405,9 @@ final class ApiController extends Controller $position = $this->createPositionFromRequest($request); $this->createModel($request->header->account, $position, PositionMapper::class, 'position', $request->getOrigin()); - if ($this->app->appSettings->get(null, SettingsEnum::GROUP_GENERATE_AUTOMATICALLY_POSITION)->content === '1') { + /** @var \Model\Setting $setting */ + $setting = $this->app->appSettings->get(null, SettingsEnum::GROUP_GENERATE_AUTOMATICALLY_POSITION); + if ($setting->content === '1') { $newRequest = new HttpRequest(); $newRequest->header->account = $request->header->account; $newRequest->setData('name', 'org:pos:' . \str_replace(' ', '_', \strtolower($position->name))); @@ -577,7 +581,9 @@ final class ApiController extends Controller $department = $this->createDepartmentFromRequest($request); $this->createModel($request->header->account, $department, DepartmentMapper::class, 'department', $request->getOrigin()); - if ($this->app->appSettings->get(null, SettingsEnum::GROUP_GENERATE_AUTOMATICALLY_DEPARTMENT)->content === '1') { + /** @var \Model\Setting $setting */ + $setting = $this->app->appSettings->get(null, SettingsEnum::GROUP_GENERATE_AUTOMATICALLY_DEPARTMENT); + if ($setting->content === '1') { $newRequest = new HttpRequest(); $newRequest->header->account = $request->header->account; $newRequest->setData('name', 'org:dep:' . \strtolower($department->name)); diff --git a/Theme/Backend/Components/DepartmentTagSelector/DepartmentTagSelectorPopupView.php b/Theme/Backend/Components/DepartmentTagSelector/DepartmentTagSelectorPopupView.php index a7a31f7..08320f2 100755 --- a/Theme/Backend/Components/DepartmentTagSelector/DepartmentTagSelectorPopupView.php +++ b/Theme/Backend/Components/DepartmentTagSelector/DepartmentTagSelectorPopupView.php @@ -78,7 +78,9 @@ class DepartmentTagSelectorPopupView extends View */ public function render(mixed ...$data) : string { + /** @var array{0:null|string} $data */ $this->id = $data[0] ?? $this->id; + return parent::render(); } } diff --git a/Theme/Backend/Components/DepartmentTagSelector/DepartmentTagSelectorView.php b/Theme/Backend/Components/DepartmentTagSelector/DepartmentTagSelectorView.php index a20ac9a..4f4410d 100755 --- a/Theme/Backend/Components/DepartmentTagSelector/DepartmentTagSelectorView.php +++ b/Theme/Backend/Components/DepartmentTagSelector/DepartmentTagSelectorView.php @@ -95,9 +95,11 @@ class DepartmentTagSelectorView extends View */ public function render(mixed ...$data) : string { + /** @var array{0:string, 1:string, 2:null|bool} $data */ $this->id = $data[0]; $this->name = $data[1]; $this->isRequired = $data[2] ?? false; + $this->getData('department-selector-popup')->setId($this->id); return parent::render(); diff --git a/Theme/Backend/Components/PositionTagSelector/PositionTagSelectorPopupView.php b/Theme/Backend/Components/PositionTagSelector/PositionTagSelectorPopupView.php index 2d1aefa..9c1bb5c 100755 --- a/Theme/Backend/Components/PositionTagSelector/PositionTagSelectorPopupView.php +++ b/Theme/Backend/Components/PositionTagSelector/PositionTagSelectorPopupView.php @@ -78,7 +78,9 @@ class PositionTagSelectorPopupView extends View */ public function render(mixed ...$data) : string { + /** @var array{0:null|string} $data */ $this->id = $data[0] ?? $this->id; + return parent::render(); } } diff --git a/Theme/Backend/Components/PositionTagSelector/PositionTagSelectorView.php b/Theme/Backend/Components/PositionTagSelector/PositionTagSelectorView.php index 09e33a8..d21df89 100755 --- a/Theme/Backend/Components/PositionTagSelector/PositionTagSelectorView.php +++ b/Theme/Backend/Components/PositionTagSelector/PositionTagSelectorView.php @@ -95,9 +95,11 @@ class PositionTagSelectorView extends View */ public function render(mixed ...$data) : string { + /** @var array{0:string, 1:string, 2:null|bool} $data */ $this->id = $data[0]; $this->name = $data[1]; $this->isRequired = $data[2] ?? false; + $this->getData('position-selector-popup')->setId($this->id); return parent::render(); diff --git a/Theme/Backend/Components/UnitTagSelector/UnitTagSelectorPopupView.php b/Theme/Backend/Components/UnitTagSelector/UnitTagSelectorPopupView.php index 4d67a9e..abb9316 100755 --- a/Theme/Backend/Components/UnitTagSelector/UnitTagSelectorPopupView.php +++ b/Theme/Backend/Components/UnitTagSelector/UnitTagSelectorPopupView.php @@ -78,6 +78,8 @@ class UnitTagSelectorPopupView extends View */ public function render(mixed ...$data) : string { + /** @var array{0:null|string} $data */ + $this->id = $data[0] ?? $this->id; return parent::render(); } diff --git a/Theme/Backend/Components/UnitTagSelector/UnitTagSelectorView.php b/Theme/Backend/Components/UnitTagSelector/UnitTagSelectorView.php index 4e87827..050353e 100755 --- a/Theme/Backend/Components/UnitTagSelector/UnitTagSelectorView.php +++ b/Theme/Backend/Components/UnitTagSelector/UnitTagSelectorView.php @@ -95,6 +95,7 @@ class UnitTagSelectorView extends View */ public function render(mixed ...$data) : string { + /** @var array{0:string, 1:string, 2:null|bool} $data */ $this->id = $data[0]; $this->name = $data[1]; $this->isRequired = $data[2] ?? false;