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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source 
# Conflicts:
#	Tasks/Admin/Routes/Web/Api.php
This commit is contained in:
Dennis Eichhorn 2016-10-02 12:10:19 +02:00
commit 856fb3bf2e
3 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Models/DepartmentMapper.php
View File

@ -34,6 +34,13 @@ class DepartmentMapper extends DataMapperAbstract
'organization_department_unit' => ['name' => 'organization_department_unit', 'type' => 'int', 'internal' => 'unit'], 'organization_department_unit' => ['name' => 'organization_department_unit', 'type' => 'int', 'internal' => 'unit'],
]; ];
protected static $belongsTo = [
'account' => [
'mapper' => UnitMapper::class,
'dest' => 'organization_department_unit',
],
];
/** /**
* Primary table. * Primary table.
* *

7
Models/PositionMapper.php
View File

@ -34,6 +34,13 @@ class PositionMapper extends DataMapperAbstract
'organization_position_status' => ['name' => 'organization_position_status', 'type' => 'int', 'internal' => 'status'], 'organization_position_status' => ['name' => 'organization_position_status', 'type' => 'int', 'internal' => 'status'],
]; ];
protected static $belongsTo = [
'account' => [
'mapper' => PositionMapper::class,
'dest' => 'organization_position_parent',
],
];
/** /**
* Primary table. * Primary table.
* *

7
Models/UnitMapper.php
View File

@ -33,6 +33,13 @@ class UnitMapper extends DataMapperAbstract
'organization_unit_status' => ['name' => 'organization_unit_status', 'type' => 'int', 'internal' => 'status'], 'organization_unit_status' => ['name' => 'organization_unit_status', 'type' => 'int', 'internal' => 'status'],
]; ];
protected static $belongsTo = [
'account' => [
'mapper' => UnitMapper::class,
'dest' => 'organization_uni_parent',
],
];
/** /**
* Primary table. * Primary table.
* *