galads/icehrm
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Production build + fixing code style issues

Browse Source
This commit is contained in:
Alan Cell
2020-11-06 20:08:07 +01:00
parent 2abe52963f
commit e9baf45d7c
4 changed files with 8 additions and 30993 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/Employees/User/Api/EmployeesActionManager.php
View File

@@ -56,9 +56,9 @@ class EmployeesActionManager extends SubActionManager
if (!empty($childCompaniesIds)) { if (!empty($childCompaniesIds)) {
$childStructureSubordinates $childStructureSubordinates
= $obj->Find( = $obj->Find(
"department in (" . implode(',', $childCompaniesIds) . ") and id != ?", "department in (" . implode(',', $childCompaniesIds) . ") and id != ?",
array($cemp) array($cemp)
); );
$subordinates = array_merge($subordinates, $childStructureSubordinates); $subordinates = array_merge($subordinates, $childStructureSubordinates);
} }

30987
web/dist/admin-bundle.js vendored
View File

File diff suppressed because one or more lines are too long

4
web/dist/common.js vendored
View File

File diff suppressed because one or more lines are too long

4
web/dist/modules-bundle.js vendored
View File

File diff suppressed because one or more lines are too long