diff --git a/app/Http/Controllers/RoleController.php b/app/Http/Controllers/RoleController.php index c4dfedd..27be130 100644 --- a/app/Http/Controllers/RoleController.php +++ b/app/Http/Controllers/RoleController.php @@ -88,8 +88,8 @@ class RoleController extends Controller { //don't allow changing the admin slug, because it will make the routes inaccessbile due to faile ability check $role->delete(); return response(['error' => 0, 'message' => 'role has been deleted']); - } else { - return response(['error' => 1, 'message' => 'you cannot delete this role'], 422); } + + return response(['error' => 1, 'message' => 'you cannot delete this role'], 422); } } diff --git a/app/Http/Controllers/UserRoleController.php b/app/Http/Controllers/UserRoleController.php index 6c82925..9992fb0 100644 --- a/app/Http/Controllers/UserRoleController.php +++ b/app/Http/Controllers/UserRoleController.php @@ -31,10 +31,9 @@ class UserRoleController extends Controller { $role = Role::find($data['role_id']); if (!$user->roles()->find($data['role_id'])) { $user->roles()->attach($role); - return $user->load('roles'); - } else { - return $user->load('roles'); } + + return $user->load('roles'); } /**