From ecf041fa1060125233513c430cd8d562bf720fa6 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 27 Sep 2017 15:18:29 -0700 Subject: [PATCH] Fixes #4043 - standardize groups API response --- app/Http/Controllers/Api/GroupsController.php | 2 +- app/Http/Transformers/GroupsTransformer.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Api/GroupsController.php b/app/Http/Controllers/Api/GroupsController.php index a821b57cef..dc19f17502 100644 --- a/app/Http/Controllers/Api/GroupsController.php +++ b/app/Http/Controllers/Api/GroupsController.php @@ -73,7 +73,7 @@ class GroupsController extends Controller { $this->authorize('view', Group::class); $group = Group::findOrFail($id); - return $group; + return (new GroupsTransformer)->transformGroup($group); } diff --git a/app/Http/Transformers/GroupsTransformer.php b/app/Http/Transformers/GroupsTransformer.php index a40a23bf02..3cec01f99f 100644 --- a/app/Http/Transformers/GroupsTransformer.php +++ b/app/Http/Transformers/GroupsTransformer.php @@ -23,7 +23,7 @@ class GroupsTransformer $array = [ 'id' => (int) $group->id, 'name' => e($group->name), - 'permissions' => $group->permissions, + 'permissions' => json_decode($group->permissions), 'users_count' => (int) $group->users_count, 'created_at' => Helper::getFormattedDateObject($group->created_at, 'datetime'), 'updated_at' => Helper::getFormattedDateObject($group->updated_at, 'datetime'),