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

inspection fixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2020-07-31 18:13:52 +02:00
parent fa5287a398
commit d02ab9c34f
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Controller/ApiController.php
View File

@ -370,7 +370,7 @@ final class ApiController extends Controller
$parent = (int) $request->getData('parent'); $parent = (int) $request->getData('parent');
$position->setParent(!empty($parent) ? new NullPosition($parent) : $position->getParent()); $position->setParent(!empty($parent) ? new NullPosition($parent) : $position->getParent());
$department = (int) $request->getData('department', $request->getOrigin()); $department = (int) $request->getData('department');
$position->setDepartment(!empty($department) ? new NullDepartment($department) : $position->getDepartment()); $position->setDepartment(!empty($department) ? new NullDepartment($department) : $position->getDepartment());
$position->setStatus((int) ($request->getData('status') ?? $position->getStatus())); $position->setStatus((int) ($request->getData('status') ?? $position->getStatus()));
@ -431,7 +431,7 @@ final class ApiController extends Controller
$parent = (int) $request->getData('parent'); $parent = (int) $request->getData('parent');
$position->setParent(!empty($parent) ? new NullPosition($parent) : null); $position->setParent(!empty($parent) ? new NullPosition($parent) : null);
$department = (int) $request->getData('department', $request->getOrigin()); $department = (int) $request->getData('department');
$position->setDepartment(!empty($department) ? new NullDepartment($department) : null); $position->setDepartment(!empty($department) ? new NullDepartment($department) : null);
return $position; return $position;
@ -527,7 +527,7 @@ final class ApiController extends Controller
$department->setParent(!empty($parent) ? new NullDepartment($parent) : $department->getParent()); $department->setParent(!empty($parent) ? new NullDepartment($parent) : $department->getParent());
$department->setStatus((int) ($request->getData('status') ?? $department->getStatus())); $department->setStatus((int) ($request->getData('status') ?? $department->getStatus()));
$unit = (int) $request->getData('unit', $request->getOrigin()); $unit = (int) $request->getData('unit');
$department->setUnit(!empty($unit) ? new NullUnit($unit) : $department->getUnit()); $department->setUnit(!empty($unit) ? new NullUnit($unit) : $department->getUnit());
return $department; return $department;

6
Theme/Backend/Components/PositionTagSelector/PositionTagSelectorPopupView.php
View File

@ -30,6 +30,12 @@ use phpOMS\Views\View;
*/ */
class PositionTagSelectorPopupView extends View class PositionTagSelectorPopupView extends View
{ {
/**
* Dom id.
*
* @var string
* @since 1.0.0
*/
private string $id = ''; private string $id = '';
/** /**