Jingga/oms-Organization
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Organization.git synced 2026-02-16 08:18:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix bugs
Some checks failed
Image optimization / general_image_workflow (push) Has been cancelled
Details
CI / general_module_workflow_php (push) Has been cancelled
Details
CI / general_module_workflow_js (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Dennis Eichhorn 2024-10-11 22:20:03 +00:00
parent 12c902af70
commit e9a8599146
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Controller/ApiController.php
View File

@ -797,7 +797,7 @@ final class ApiController extends Controller
{ {
/** @var \Modules\Organization\Models\Unit[] $units */ /** @var \Modules\Organization\Models\Unit[] $units */
$units = UnitMapper::getAll() $units = UnitMapper::getAll()
->where('name', '%' . ($request->getDataString('unit') ?? '') . '%', 'LIKE') ->where('name', '%' . ($request->getDataString('unit') ?? $request->getDataString('parent') ?? '') . '%', 'LIKE')
->executeGetArray(); ->executeGetArray();
$response->header->set('Content-Type', MimeType::M_JSON, true); $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 public function apiDepartmentFind(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
{ {
/** @var \Modules\Organization\Models\Department[] $departments */ /** @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() $departments = DepartmentMapper::getAll()
->where('name', '%' . ($request->getDataString('department') ?? '') . '%', 'LIKE') ->where('name', '%' . ($request->getDataString('department') ?? $request->getDataString('parent') ?? '') . '%', 'LIKE')
->executeGetArray(); ->executeGetArray();
$response->header->set('Content-Type', MimeType::M_JSON, true); $response->header->set('Content-Type', MimeType::M_JSON, true);
@ -851,7 +854,7 @@ final class ApiController extends Controller
{ {
/** @var \Modules\Organization\Models\Position[] $positions */ /** @var \Modules\Organization\Models\Position[] $positions */
$positions = PositionMapper::getAll() $positions = PositionMapper::getAll()
->where('name', '%' . ($request->getDataString('position') ?? '') . '%', 'LIKE') ->where('name', '%' . ($request->getDataString('position') ?? $request->getDataString('parent') ?? '') . '%', 'LIKE')
->executeGetArray(); ->executeGetArray();
$response->header->set('Content-Type', MimeType::M_JSON, true); $response->header->set('Content-Type', MimeType::M_JSON, true);