Merge branch 'develop' into trunk

This commit is contained in:
Noah Lancien 2025-10-16 16:37:58 +02:00
commit d1d9ffd418
6 changed files with 29 additions and 44 deletions

3
.gitignore vendored
View file

@ -25,3 +25,6 @@ npm-debug.log
yarn-error.log
.npmrc
.phpdoc
.zshrc
.npm/
.composer/

View file

@ -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);
}
/**

View file

@ -232,7 +232,7 @@ return [
'reference' => 'référence',
'type' => 'type',
'status' => 'status',
'label' => 'label',
'label' => 'libellé',
'domain' => 'domaine',
'logo' => 'logo',
'url' => 'lien',

View file

@ -30,12 +30,12 @@
for="template"
class="col-form-label pt-0"
>
<b>{{ trans.methods.__('Choisir un template') }}</b>
<b>{{ trans.methods.__('Choisir un modèle de réponse') }}</b>
</label>
<SearchBelongsToDropdown
id="template"
name="template_id"
:label="trans.methods.__('Choisir un template')"
:label="trans.methods.__('Choisir un modèle de réponse')"
:model="claimModel"
:modelselected="selectedTemplate as VselectOption"
targetclass="App\Models\ClaimMailTemplate"

View file

@ -8,7 +8,7 @@
<span class="text-reset">{{ $cpsr_name }}&nbsp;-&nbsp;{{ $cpsr_version }}</span>
<span>-</span>
@endif
<span class="text-reset fw-bold">{{ __('LDC Web Services') }}</span>
<span class="text-reset fw-bold">{{ __('LDC Digital') }}</span>
@if (isset($cpsr_time))
© {{ date('Y') }}
@endif

View file

@ -69,12 +69,14 @@
</div>
</button>
<div class="dropdown-menu dropdown-menu-end m-0 text-center" aria-labelledby="navbarDropdown">
<a class="dropdown-item w-100 text-decoration-none p-2" data-bs-tooltip="tooltip" data-bs-placement="left"
href="{{ route('bo.users.edit',auth('backend')->user()->getKey()) }}"
title="{{ __('Accéder à son profile') }}">
{{ __('Profile') }}
</a>
<hr class="dropdown-divider m-0">
@can('update', \App\Models\User::class)
<a class="dropdown-item w-100 text-decoration-none p-2" data-bs-tooltip="tooltip" data-bs-placement="left"
href="{{ route('bo.users.edit',auth('backend')->user()->getKey()) }}"
title="{{ __('Accéder à son profil') }}">
{{ __('Profil') }}
</a>
<hr class="dropdown-divider m-0">
@endcan
<form class="m-0 text-center" id="logout-form" action="{{ route('bo.logout') }}" method="POST">
@csrf
<button class="dropdown-item w-100 text-decoration-none p-2" data-bs-tooltip="tooltip" data-bs-placement="left"