diff --git a/src/app/group/controllers/GroupController.php b/src/app/group/controllers/GroupController.php index a5ffddb0c3bad5604bfd2ec2aceb86d2c734da4f..5dd74b3e0071836c8d9438808158e6cfba170730 100644 --- a/src/app/group/controllers/GroupController.php +++ b/src/app/group/controllers/GroupController.php @@ -136,7 +136,6 @@ class GroupController $group['users'] = GroupModel::getUsersByGroupId(['groupId' => $group['group_id'], 'select' => ['users.id', 'users.user_id', 'users.firstname', 'users.lastname']]); $group['security'] = GroupModel::getSecurityByGroupId(['groupId' => $group['group_id']]); $group['services'] = GroupModel::getAllServicesByGroupId(['groupId' => $group['group_id']]); - $group['services']['administration'] = GroupController::arraySort(['data' => $group['services']['administration'], 'on' => 'name']); return $response->withJson(['group' => $group]); } @@ -183,7 +182,7 @@ class GroupController return $response->withJson(['success' => 'success']); } - private static function arraySort($aArgs) + public static function arraySort($aArgs) { ValidatorModel::notEmpty($aArgs, ['data', 'on']); ValidatorModel::arrayType($aArgs, ['data']); diff --git a/src/app/group/models/GroupModelAbstract.php b/src/app/group/models/GroupModelAbstract.php index 0f87b2fce36ada0dde4ed1edfb75aa0e21a68d44..7d18f4e51eb8c0dedf1066027221b92665655ed4 100644 --- a/src/app/group/models/GroupModelAbstract.php +++ b/src/app/group/models/GroupModelAbstract.php @@ -16,6 +16,7 @@ namespace Group\models; use Core\Models\ServiceModel; use Core\Models\UserModel; +use Group\controllers\GroupController; use SrcCore\models\DatabaseModel; use SrcCore\models\ValidatorModel; @@ -273,7 +274,6 @@ class GroupModelAbstract $services = []; foreach ($allServices as $key => $value) { $menu = []; - $administration = []; $use = []; foreach ($value as $value2) { if (!$value2['system_service']) { @@ -295,14 +295,19 @@ class GroupModelAbstract if (!empty($menu)) { $services['menu'][] = $menu; } -// if (!empty($administration)) { -// $services['administration'][] = $administration; -// } if (!empty($use)) { $services['use'][] = $use; } } + foreach ($services['menu'] as $key => $menu) { + $services['menu'][$key] = GroupController::arraySort(['data' => $menu, 'on' => 'name']); + } + foreach ($services['use'] as $key => $use) { + $services['use'][$key] = GroupController::arraySort(['data' => $use, 'on' => 'name']); + } + $services['administration'] = GroupController::arraySort(['data' => $services['administration'], 'on' => 'name']); + return $services; }