Jingga/oms-Organization
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Organization.git synced 2026-01-26 22:58:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

phpcbf

Browse Source
This commit is contained in:
Dennis Eichhorn 2018-02-03 13:09:09 +01:00
parent 3f0ed5638c
commit c50a2e82bc
7 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Admin/Update.php
View File

@ -19,7 +19,6 @@ use phpOMS\Module\UpdateAbstract;
use phpOMS\System\File\Directory;
use phpOMS\Module\InfoManager;
/**
* Navigation class.
*

15
Controller.php
View File

@ -359,8 +359,7 @@ class Controller extends ModuleAbstract implements WebInterface
private function validateUnitCreate(RequestAbstract $request) : array
{
$val = [];
if (
($val['name'] = empty($request->getData('name')))
if (($val['name'] = empty($request->getData('name')))
|| ($val['parent'] = (
!empty($request->getData('parent'))
&& !is_numeric($request->getData('parent'))
@ -424,7 +423,7 @@ class Controller extends ModuleAbstract implements WebInterface
return;
}
$unit = UnitMapper::get((int) $request->getData('id'));
$unit = UnitMapper::get((int) $request->getData('id'));
$status = UnitMapper::delete($unit);
$response->set($request->__toString(), $status);
@ -462,8 +461,7 @@ class Controller extends ModuleAbstract implements WebInterface
private function validatePositionCreate(RequestAbstract $request) : array
{
$val = [];
if (
($val['name'] = empty($request->getData('name')))
if (($val['name'] = empty($request->getData('name')))
|| ($val['parent'] = (
!empty($request->getData('parent'))
&& !is_numeric($request->getData('parent'))
@ -504,7 +502,7 @@ class Controller extends ModuleAbstract implements WebInterface
}
$position = PositionMapper::get((int) $request->getData('id'));
$status = PositionMapper::delete($position);
$status = PositionMapper::delete($position);
$response->set($request->__toString(), $status);
}
@ -571,8 +569,7 @@ class Controller extends ModuleAbstract implements WebInterface
private function validateDepartmentCreate(RequestAbstract $request) : array
{
$val = [];
if (
($val['name'] = empty($request->getData('name')))
if (($val['name'] = empty($request->getData('name')))
|| ($val['parent'] = (
!empty($request->getData('parent'))
&& !is_numeric($request->getData('parent'))
@ -639,7 +636,7 @@ class Controller extends ModuleAbstract implements WebInterface
}
$department = DepartmentMapper::get((int) $request->getData('id'));
$status = DepartmentMapper::delete($department);
$status = DepartmentMapper::delete($department);
$response->set($request->__toString(), $status);
}

2
Models/NullDepartment.php
View File

@ -16,4 +16,4 @@ namespace Modules\Organization\Models;
class NullDepartment extends Department
{
}
}

2
Models/NullPosition.php
View File

@ -16,4 +16,4 @@ namespace Modules\Organization\Models;
class NullPosition extends Position
{
}
}

2
Models/NullUnit.php
View File

@ -16,4 +16,4 @@ namespace Modules\Organization\Models;
class NullUnit extends Unit
{
}
}

4
Models/PermissionState.php
View File

@ -26,7 +26,7 @@ use phpOMS\Stdlib\Base\Enum;
*/
abstract class PermissionState extends Enum
{
/* public */ const UNIT = 1;
/* public */ const UNIT = 1;
/* public */ const DEPARTMENT = 2;
/* public */ const POSITION = 3;
/* public */ const POSITION = 3;
}

4
Models/Status.php
View File

@ -26,7 +26,7 @@ use phpOMS\Stdlib\Base\Enum;
*/
abstract class Status extends Enum
{
/* public */ const ACTIVE = 1;
/* public */ const ACTIVE = 1;
/* public */ const INACTIVE = 2;
/* public */ const HIDDEN = 4;
/* public */ const HIDDEN = 4;
}