From e9a85991463045b1a28c54c02c2409392efd91a3 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Fri, 11 Oct 2024 22:20:03 +0000 Subject: [PATCH] fix bugs --- Controller/ApiController.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 07949f1..38b042b 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -797,7 +797,7 @@ final class ApiController extends Controller { /** @var \Modules\Organization\Models\Unit[] $units */ $units = UnitMapper::getAll() - ->where('name', '%' . ($request->getDataString('unit') ?? '') . '%', 'LIKE') + ->where('name', '%' . ($request->getDataString('unit') ?? $request->getDataString('parent') ?? '') . '%', 'LIKE') ->executeGetArray(); $response->header->set('Content-Type', MimeType::M_JSON, true); @@ -823,8 +823,11 @@ final class ApiController extends Controller public function apiDepartmentFind(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void { /** @var \Modules\Organization\Models\Department[] $departments */ + // @todo This below is bad, we should only search for department and not for parent. + // If we do this we of course have to change the apiCreate() functions (also for similar Find()) + // We also must change the setup scripts $departments = DepartmentMapper::getAll() - ->where('name', '%' . ($request->getDataString('department') ?? '') . '%', 'LIKE') + ->where('name', '%' . ($request->getDataString('department') ?? $request->getDataString('parent') ?? '') . '%', 'LIKE') ->executeGetArray(); $response->header->set('Content-Type', MimeType::M_JSON, true); @@ -851,7 +854,7 @@ final class ApiController extends Controller { /** @var \Modules\Organization\Models\Position[] $positions */ $positions = PositionMapper::getAll() - ->where('name', '%' . ($request->getDataString('position') ?? '') . '%', 'LIKE') + ->where('name', '%' . ($request->getDataString('position') ?? $request->getDataString('parent') ?? '') . '%', 'LIKE') ->executeGetArray(); $response->header->set('Content-Type', MimeType::M_JSON, true);