Merge branch 'trunk'

This commit is contained in:
Vincent BRIDIER 2022-03-31 18:32:20 +02:00
commit 3a866c0a97
No known key found for this signature in database
GPG key ID: 8571BFA20420D512
3 changed files with 4 additions and 11 deletions

View file

@ -17,7 +17,7 @@ class SendNotificationMailToTicketCreator
public function handle(NotifyTicketCreator $event)
{
$ticket = $event->ticket;
Mail::to($ticket->user()->withTrashed()->email)
Mail::to($ticket->user()->withTrashed()->first()->email)
->send(new TicketUpdate($ticket, $event->corpsMaj));
}
}

View file

@ -1,6 +1,5 @@
document.addEventListener('DOMContentLoaded', () => {
let sessionValidates = document.querySelectorAll('[data-validate-session]'),
validateSession = require('./modules/session_pinger').default.methods.validateSession,
let validateSession = require('./modules/session_pinger').default.methods.validateSession,
sessionInvalidAction = () => {
Swal.fire({
title: 'Session expirée',
@ -20,10 +19,4 @@ document.addEventListener('DOMContentLoaded', () => {
if (window.__SESSION_WATCH) {
timerAction()
}
for (let element of sessionValidates) {
element.addEventListener('click', () => {
validateSession(sessionInvalidAction)
})
}
})

View file

@ -65,7 +65,7 @@
<h4>
{{ __('Suivi') }}
@can('createMessage', $ticket)
<button data-validate-session type="button" class="btn btn-sm btn-primary float-end" data-bs-toggle="modal" data-bs-target="#messageModal">
<button type="button" class="btn btn-sm btn-primary float-end" data-bs-toggle="modal" data-bs-target="#messageModal">
{{ __('Répondre') }}
</button>
<div class="modal fade" id="messageModal" tabindex="-1" aria-labelledby="messageModalLabel" aria-hidden="true">
@ -104,7 +104,7 @@
</div>
<div class="modal-footer">
<button type="reset" class="btn btn-sm btn-danger" data-bs-dismiss="modal">{{ __('Fermer') }}</button>
<button data-validate-session type="submit" class="btn btn-sm btn-success">{{ __('Envoyer') }}</button>
<button type="submit" class="btn btn-sm btn-success">{{ __('Envoyer') }}</button>
</div>
</form>
</div>