diff --git a/.gitignore b/.gitignore index c06ef95..5a0e861 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,6 @@ npm-debug.log yarn-error.log .npmrc .phpdoc +.zshrc +.npm/ +.composer/ 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/lang/fr/validation.php b/resources/lang/fr/validation.php index 5138f0c..2a8c524 100644 --- a/resources/lang/fr/validation.php +++ b/resources/lang/fr/validation.php @@ -232,7 +232,7 @@ return [ 'reference' => 'référence', 'type' => 'type', 'status' => 'status', - 'label' => 'label', + 'label' => 'libellé', 'domain' => 'domaine', 'logo' => 'logo', 'url' => 'lien', diff --git a/resources/ts/bo/components/ClaimManualResponseComponent.vue b/resources/ts/bo/components/ClaimManualResponseComponent.vue index 5b8f09a..216aa51 100644 --- a/resources/ts/bo/components/ClaimManualResponseComponent.vue +++ b/resources/ts/bo/components/ClaimManualResponseComponent.vue @@ -30,12 +30,12 @@ for="template" class="col-form-label pt-0" > - {{ trans.methods.__('Choisir un template') }} + {{ trans.methods.__('Choisir un modèle de réponse') }} {{ $cpsr_name }} - {{ $cpsr_version }} - @endif - {{ __('LDC Web Services') }} + {{ __('LDC Digital') }} @if (isset($cpsr_time)) © {{ date('Y') }} @endif diff --git a/resources/views/bo/layouts/header.blade.php b/resources/views/bo/layouts/header.blade.php index ee9d1f5..6b32c7c 100644 --- a/resources/views/bo/layouts/header.blade.php +++ b/resources/views/bo/layouts/header.blade.php @@ -69,12 +69,14 @@