Merge branch 'trunk'
This commit is contained in:
commit
3d81cd77ce
6 changed files with 8 additions and 5 deletions
|
|
@ -16,6 +16,7 @@ enum TicketFileTypeEnum: int
|
|||
case docx = '.docx';
|
||||
case xlsx = '.xlsx';
|
||||
case csv = '.csv';
|
||||
case svg = '.svg';
|
||||
|
||||
/**
|
||||
* Optionnal labels definition
|
||||
|
|
@ -29,6 +30,7 @@ enum TicketFileTypeEnum: int
|
|||
self::docx->name => "Fichier docx",
|
||||
self::xlsx->name => "Fichier xlsx",
|
||||
self::csv->name => "Fichier csv",
|
||||
self::svg->name => "Fichier svg",
|
||||
];
|
||||
|
||||
/**
|
||||
|
|
@ -43,6 +45,7 @@ enum TicketFileTypeEnum: int
|
|||
self::docx->name => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
|
||||
self::xlsx->name => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
|
||||
self::csv->name => 'text/csv',
|
||||
self::svg->name => 'image/svg+xml',
|
||||
];
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -806,7 +806,7 @@ class TicketController extends Controller
|
|||
*/
|
||||
private function formatGitlabFiles(Ticket $ticket, array $uploadedFile, int $fileNb)
|
||||
{
|
||||
if (Str::endsWith($ticket->file, ['jpg', 'png', 'jpeg', 'pptx', 'docx', 'xslx', 'csv'])) {
|
||||
if (Str::endsWith($ticket->file, ['jpg', 'png', 'jpeg', 'pptx', 'docx', 'xslx', 'csv', 'svg'])) {
|
||||
$file = \sprintf(
|
||||
"",
|
||||
$fileNb,
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ class CreateMessage extends FormRequest
|
|||
'subscribe' => 'required|boolean',
|
||||
'message' => 'required|min:' . ($user->isAdmin() ? '5' : '20'),
|
||||
'file_messages' => 'sometimes|array',
|
||||
'file_messages.*' => 'mimes:pptx,docx,xlsx,csv,txt,jpeg,jpg,png,pdf|max:2048',
|
||||
'file_messages.*' => 'mimes:pptx,docx,xlsx,csv,txt,jpeg,jpg,png,pdf,svg|max:2048',
|
||||
'type' => ['required', new Enum(MessageTypeEnum::class)]
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -100,7 +100,7 @@ class StoreTicket extends FormRequest
|
|||
'text' => 'required|string|min:40',
|
||||
'title' => 'required|string|between:3,255',
|
||||
'file_tickets' => 'sometimes|array',
|
||||
'file_tickets.*' => 'mimes:pptx,docx,xlsx,csv,txt,jpeg,jpg,png,pdf|max:2048',
|
||||
'file_tickets.*' => 'mimes:pptx,docx,xlsx,csv,txt,jpeg,jpg,png,pdf,svg|max:2048',
|
||||
'is_internal' => 'required|boolean',
|
||||
'labels' => 'sometimes|array',
|
||||
'labels.*' => [
|
||||
|
|
|
|||
|
|
@ -114,7 +114,7 @@
|
|||
@for ($i = 1; $i < 6; $i++)
|
||||
<h4>Fichier joint {{ $i }}</h4>
|
||||
<div class="form-group mb-3">
|
||||
<input name="file_tickets[]" type="file" accept="image/png, image/jpeg, image/jpg, .pdf, .pptx, .docx, .xlsx, .csv">
|
||||
<input name="file_tickets[]" type="file" accept="image/png, image/jpeg, image/jpg, .pdf, .pptx, .docx, .xlsx, .csv, image/svg+xml">
|
||||
@if (isset($ticket) and $ticket->file !== null)
|
||||
@php
|
||||
$fileNumber = 'file'. $i;
|
||||
|
|
|
|||
|
|
@ -150,7 +150,7 @@
|
|||
<div class="col">
|
||||
<h4>Fichier joint {{ $i }}</h4>
|
||||
<input class="form-control" name="file_messages[]" type="file"
|
||||
accept="image/png, image/jpeg, image/jpg, .pdf, .pptx, .docx, .xlsx, .csv">
|
||||
accept="image/png, image/jpeg, image/jpg, .pdf, .pptx, .docx, .xlsx, .csv, image/svg+xml">
|
||||
</div>
|
||||
</div>
|
||||
@endfor
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue