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

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

Browse Source 
# Conflicts:
#	Admin/Controller.php
This commit is contained in:
Dennis Eichhorn 2017-07-09 23:10:42 +02:00
commit 4241ed39a2
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Controller.php
View File

@ -412,7 +412,7 @@ class Controller extends ModuleAbstract implements WebInterface
$account->setEmail($request->getData('email'));
$account->generatePassword($request->getData('password'));
return $account;
return $account;
}
public function apiAccountDelete(RequestAbstract $request, ResponseAbstract $response, $data = null)

2
Models/AccountMapper.php
View File

@ -192,6 +192,6 @@ class AccountMapper extends DataMapperAbstract
*/
public static function get($primaryKey, int $relations = RelationType::ALL, $fill = null)
{
return parent::get((int) $primaryKey, $relations, $fill);
return parent::get($primaryKey, $relations, $fill);
}
}

2
Models/GroupMapper.php
View File

@ -74,6 +74,6 @@ class GroupMapper extends DataMapperAbstract
*/
public static function get($primaryKey, int $relations = RelationType::ALL, $fill = null)
{
return parent::get((int) $primaryKey, $relations, $fill);
return parent::get($primaryKey, $relations, $fill);
}
}