diff --git a/app/Policies/UserPolicy.php b/app/Policies/UserPolicy.php index 9cdf972..09a0598 100644 --- a/app/Policies/UserPolicy.php +++ b/app/Policies/UserPolicy.php @@ -23,13 +23,11 @@ class UserPolicy * Determine whether the user can view the model. * * @param \App\Models\User $authUser - * @param \App\Models\User $user * @return boolean */ - public function view(User $authUser, User $user): bool + public function view(User $authUser): bool { - return UserStaticRules::atLeastRole($authUser, RoleEnum::conceptor) and - UserStaticRules::atLeastRole($authUser, $user->role); + return UserStaticRules::atLeastRole($authUser, RoleEnum::conceptor); } /** @@ -47,84 +45,66 @@ class UserPolicy * Determine whether the user can update the model. * * @param \App\Models\User $authUser - * @param \App\Models\User $user * @return boolean */ - public function update(User $authUser, User $user): bool + public function update(User $authUser): bool { - return $authUser->getRouteKey() === $user->getRouteKey() or - (UserStaticRules::atLeastRole($authUser, RoleEnum::conceptor) and - UserStaticRules::atLeastRole($authUser, $user->role)); + return UserStaticRules::atLeastRole($authUser, RoleEnum::conceptor); } /** * Determine whether the user can delete the model. * * @param \App\Models\User $authUser - * @param \App\Models\User $user * @return boolean */ - public function delete(User $authUser, User $user): bool + public function delete(User $authUser): bool { - return $authUser->getRouteKey() !== $user->getRouteKey() and - UserStaticRules::atLeastRole($authUser, RoleEnum::conceptor) and - UserStaticRules::atLeastRole($authUser, $user->role); + return UserStaticRules::atLeastRole($authUser, RoleEnum::conceptor); } /** * Determine whether the user can restore the model. * * @param \App\Models\User $authUser - * @param \App\Models\User $user * @return boolean */ - public function restore(User $authUser, User $user): bool + public function restore(User $authUser): bool { - return $authUser->getRouteKey() !== $user->getRouteKey() and - UserStaticRules::atLeastRole($authUser, RoleEnum::conceptor) and - UserStaticRules::atLeastRole($authUser, $user->role); + return UserStaticRules::atLeastRole($authUser, RoleEnum::conceptor); } /** * Determine whether the user can permanently delete the model. * * @param \App\Models\User $authUser - * @param \App\Models\User $user * @return booleanean */ - public function forceDelete(User $authUser, User $user): bool + public function forceDelete(User $authUser): bool { - return $authUser->getRouteKey() !== $user->getRouteKey() and - UserStaticRules::atLeastRole($authUser, RoleEnum::conceptor) and - UserStaticRules::atLeastRole($authUser, $user->role); + return UserStaticRules::atLeastRole($authUser, RoleEnum::conceptor); } /** * Determine whether the user can duplicate the model. * * @param \App\Models\User $authUser - * @param \App\Models\User $user * @return booleanean */ - public function duplicate(User $authUser, User $user): bool + public function duplicate(User $authUser): bool { - return $authUser->getRouteKey() !== $user->getRouteKey() and - UserStaticRules::atLeastRole($authUser, RoleEnum::conceptor) and - UserStaticRules::atLeastRole($authUser, $user->role); + return UserStaticRules::atLeastRole($authUser, RoleEnum::conceptor); } /** * Determine whether the user can publish/unpublish the model. * * @param \App\Models\User $authUser - * @param \App\Models\User $user * @return booleanean */ - public function changePublished(User $authUser, User $user): bool + public function changePublished(User $authUser): bool { - return $authUser->getRouteKey() !== $user->getRouteKey() and - UserStaticRules::atLeastRole($authUser, RoleEnum::conceptor) and - UserStaticRules::atLeastRole($authUser, $user->role); + return UserStaticRules::atLeastRole($authUser, RoleEnum::conceptor); } /** diff --git a/resources/views/bo/layouts/header.blade.php b/resources/views/bo/layouts/header.blade.php index d0b37f3..6b32c7c 100644 --- a/resources/views/bo/layouts/header.blade.php +++ b/resources/views/bo/layouts/header.blade.php @@ -69,7 +69,7 @@