diff --git a/app/Http/Controllers/Api/GroupsController.php b/app/Http/Controllers/Api/GroupsController.php index 5f2e222c70..0f474ece83 100644 --- a/app/Http/Controllers/Api/GroupsController.php +++ b/app/Http/Controllers/Api/GroupsController.php @@ -76,7 +76,7 @@ class GroupsController extends Controller $this->authorize('superadmin'); $group = new Group; // Get all the available permissions - $permissions = config('permissions'); + $permissions = json_encode(config('permissions')); $groupPermissions = Helper::selectedPermissionsArray($permissions, $permissions); $group->name = $request->input('name'); diff --git a/app/Models/Group.php b/app/Models/Group.php index fd27dfbc0d..253d47fbb9 100755 --- a/app/Models/Group.php +++ b/app/Models/Group.php @@ -81,6 +81,9 @@ class Group extends SnipeModel public function decodePermissions() { // Set default to empty JSON if the value is null + if (is_array($this->permissions)) { + $this->permissions = json_encode($this->permissions); + } $permissions = json_decode($this->permissions ?? '{}', JSON_OBJECT_AS_ARRAY); // If there are no permissions, return an empty array