Merge branch 'develop' into issue-6
This commit is contained in:
commit
46e3018f0d
3 changed files with 11 additions and 5 deletions
|
|
@ -19,6 +19,12 @@ class CreateMessage extends FormRequest
|
|||
if (!($user = auth()->user())) {
|
||||
return false;
|
||||
}
|
||||
if (
|
||||
!auth()->user()->can('createPrivateMessage', request()->route()->ticket)
|
||||
&& $this->is_private == MessageType::private()
|
||||
) {
|
||||
return false;
|
||||
}
|
||||
return auth()->check() and auth()->user()->sites and (
|
||||
$user->isAdmin() or
|
||||
auth()->user()->sites->contains(request()->route()->ticket->site_id)
|
||||
|
|
@ -36,7 +42,7 @@ class CreateMessage extends FormRequest
|
|||
{
|
||||
$this->merge([
|
||||
'subscribe' => $this->subscribe ? true : false,
|
||||
'type' => $this->type == MessageType::private() ? MessageType::private()->value : MessageType::public()->value
|
||||
'type' => $this->is_private ? MessageType::private()->value : MessageType::public()->value
|
||||
]);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ class TicketPolicy extends RootPolicy
|
|||
]),
|
||||
'suscribeToTicket' => TicketStaticRules::make('ticketIsNotArchived', $model),
|
||||
'createMessage' => TicketStaticRules::make('ticketIsNotArchived', $model),
|
||||
'createPrivateMessage' => StaticRules::or([
|
||||
'createPrivateMessage' => StaticRules::and([
|
||||
URR::make('userIsAdmin', $user),
|
||||
TicketStaticRules::make('ticketIsNotArchived', $model),
|
||||
]),
|
||||
|
|
|
|||
|
|
@ -126,11 +126,11 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@if(Auth::check() and !Auth::user()->role->equals(Role::client()))
|
||||
@can('createPrivateMessage', $ticket)
|
||||
<div class="row mt-4">
|
||||
<div class="col">
|
||||
<div class="form-check">
|
||||
<input name="type" type="checkbox" class="form-check-input" id="setPrivate" autocomplete="off" value="{{MessageTypeEnum::private()}}">
|
||||
<input name="is_private" type="checkbox" class="form-check-input" id="setPrivate" autocomplete="off" value="{{MessageTypeEnum::private()}}">
|
||||
<label class="form-check-label" for="setPrivate">{{ __('Rendre le message privé') }}</label>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -159,7 +159,7 @@
|
|||
@else
|
||||
@if (
|
||||
$message->type->equals(MessageTypeEnum::public()) ||
|
||||
($message->type->equals(MessageTypeEnum::private()) && !Auth::user()->role->equals(Role::client()))
|
||||
(Auth::user()->can('createPrivateMessage', $ticket))
|
||||
)
|
||||
<div class="@if($message->user_id === Auth::user()->id)offset-md-4 alert-dark @else alert-light @endif @if($message->type->equals(MessageTypeEnum::private())) border border-danger border-2 @endif col-md-8 alert">
|
||||
@if ($message->type->equals(MessageTypeEnum::private()))
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue