Merge branch 'trunk'
This commit is contained in:
commit
9dd3f648bd
1 changed files with 5 additions and 1 deletions
|
|
@ -300,6 +300,10 @@ class TicketController extends Controller
|
||||||
$user->subscriptions()->detach($ticket->id);
|
$user->subscriptions()->detach($ticket->id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$message->saveOrFail();
|
||||||
|
|
||||||
|
//ici $message->id n'est pas connu lors de la création du message.
|
||||||
|
//on doit donc sauvegarder cette info après le create initial
|
||||||
if ($request->file_message) {
|
if ($request->file_message) {
|
||||||
$siteSlug = Str::slug($ticket->site->name);
|
$siteSlug = Str::slug($ticket->site->name);
|
||||||
$fileMessage = $request->file_message;
|
$fileMessage = $request->file_message;
|
||||||
|
|
@ -308,9 +312,9 @@ class TicketController extends Controller
|
||||||
$fileMessage->move(public_path('fichiers/' . $siteSlug . '/' . $ticket->id . '/'), $fileName);
|
$fileMessage->move(public_path('fichiers/' . $siteSlug . '/' . $ticket->id . '/'), $fileName);
|
||||||
$filePath = 'fichiers/' . $siteSlug . '/' . $ticket->id . '/' . $fileName;
|
$filePath = 'fichiers/' . $siteSlug . '/' . $ticket->id . '/' . $fileName;
|
||||||
$message->file = $filePath;
|
$message->file = $filePath;
|
||||||
|
$message->saveOrFail();
|
||||||
}
|
}
|
||||||
|
|
||||||
$message->saveOrFail();
|
|
||||||
|
|
||||||
return back()
|
return back()
|
||||||
->with('success', trans('Votre message à été ajouté'));
|
->with('success', trans('Votre message à été ajouté'));
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue