diff --git a/app/Http/Requests/Bo/Users/UpdateUserRequest.php b/app/Http/Requests/Bo/Users/UpdateUserRequest.php index 6c587c9..70b21eb 100644 --- a/app/Http/Requests/Bo/Users/UpdateUserRequest.php +++ b/app/Http/Requests/Bo/Users/UpdateUserRequest.php @@ -25,8 +25,14 @@ class UpdateUserRequest extends StoreUserRequest */ protected function prepareForValidation(): void { + /** @var \App\Models\User $userModel */ + $userModel = request()->route()->parameter('user'); + /** @var \App\Models\User $authUserModel */ + $authUserModel = auth('backend')->user(); $this->merge([ - 'published' => $this->boolean('published'), + 'published' => $authUserModel->getKey() !== $userModel->getKey() ? + $this->boolean('published') : + true, 'password' => $this->input('password') ?? \optional($this->route('user'))->password, 'password_confirmation' => $this->input('password_confirmation') ?? diff --git a/app/Policies/UserPolicy.php b/app/Policies/UserPolicy.php index e3c0d38..8038f88 100644 --- a/app/Policies/UserPolicy.php +++ b/app/Policies/UserPolicy.php @@ -122,8 +122,9 @@ class UserPolicy */ public function changePublished(User $authUser, User $user): bool { - return $authUser->getRouteKey() !== $user->getRouteKey() and + return ($user->getRouteKey()) ? $authUser->getRouteKey() !== $user->getRouteKey() and UserStaticRules::atLeastRole($authUser, RoleEnum::admin) and - UserStaticRules::atLeastRole($authUser, $user->role); + UserStaticRules::atLeastRole($authUser, $user->role) : + UserStaticRules::atLeastRole($authUser, RoleEnum::admin); } } diff --git a/resources/views/bo/pages/users/form.blade.php b/resources/views/bo/pages/users/form.blade.php index 880c32a..6263982 100644 --- a/resources/views/bo/pages/users/form.blade.php +++ b/resources/views/bo/pages/users/form.blade.php @@ -82,8 +82,7 @@ 'required' => true, 'associatedModels' => Arr::where( \App\Enums\Users\RoleEnum::toArray(), - fn(object $role) => $role->value >= - auth('backend')->user()->role->value()), + fn(object $role) => $role->value >= auth('backend')->user()->role->value()), 'helper' => __('Sélectionnez un rôle dans la liste déroulante.'), ]) @@ -124,22 +123,24 @@ {{-- STATUS --}} -
-
- {{ __('Visibilité') }} -
-
- @include('bo.partials.inputs.tinyint-boolean', [ - 'id' => 'userPublished', - 'name' => 'published', - 'label' => __('État de publication de l\':model', ['model' => __('models.classes.user')]), - 'helper' => __('Deux réponses possibles : oui ou non.'), - 'model' => $userModel ?? null, - ]) + @can('changePublished', $userModel) +
+
+ {{ __('Visibilité') }} +
+
+ @include('bo.partials.inputs.tinyint-boolean', [ + 'id' => 'userPublished', + 'name' => 'published', + 'label' => __('État de publication de l\':model', ['model' => __('models.classes.user')]), + 'helper' => __('Deux réponses possibles : oui ou non.'), + 'model' => $userModel ?? null, + ]) +
-
-
-
+ + + @endcan

{{ __('* Champs obligatoires') }}