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

crash backup
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 2025-03-21 02:48:18 +00:00
parent 2a8aa4e961
commit 7af0be1979
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Controller/BackendController.php
View File

@ -141,7 +141,7 @@ final class BackendController extends Controller
->with('companyHistory/position') ->with('companyHistory/position')
->with('educationHistory') ->with('educationHistory')
->with('workHistory') ->with('workHistory')
->where('id', (int) $request->getData('id')) ->where('id', $request->getDataInt('id') ?? 0)
->sort('companyHistory/end', OrderType::DESC) ->sort('companyHistory/end', OrderType::DESC)
->sort('educationHistory/start', OrderType::DESC) ->sort('educationHistory/start', OrderType::DESC)
->sort('workHistory/start', OrderType::DESC) ->sort('workHistory/start', OrderType::DESC)
@ -282,7 +282,7 @@ final class BackendController extends Controller
$histories = EmployeeHistoryMapper::getAll() $histories = EmployeeHistoryMapper::getAll()
->where('unit', $this->app->unitId) ->where('unit', $this->app->unitId)
->where('department', (int) $request->getData('id')) ->where('department', $request->getDataInt('id') ?? 0)
->where('end', null) ->where('end', null)
->executeGetArray(); ->executeGetArray();
@ -329,7 +329,7 @@ final class BackendController extends Controller
$histories = EmployeeHistoryMapper::getAll() $histories = EmployeeHistoryMapper::getAll()
->where('unit', $this->app->unitId) ->where('unit', $this->app->unitId)
->where('position', (int) $request->getData('id')) ->where('position', $request->getDataInt('id') ?? 0)
->where('end', null) ->where('end', null)
->executeGetArray(); ->executeGetArray();

2
Theme/Backend/staff-create.tpl.php
View File

@ -63,7 +63,7 @@ echo $this->data['nav']->render();
<div class="portlet-body"> <div class="portlet-body">
<div class="form-group"> <div class="form-group">
<label for="iAccount"><?= $this->getHtml('Account', 'Admin'); ?></label> <label for="iAccount"><?= $this->getHtml('Account', 'Admin'); ?></label>
<?= $this->getData('accSelector')->render('iAccount', 'accounts', true); ?> <?= $this->data['accSelector']->render('iAccount', 'accounts', true); ?>
</div> </div>
</div> </div>
<div class="portlet-foot"> <div class="portlet-foot">