DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-21 03:15:45 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

RTF support added (#7024)

Browse source 
* Added the Gatte Facade to AssetsController

* Added the filetype RTF in the modal to upload files

* Added validation of RTF files
This commit is contained in:
Ivan Nieto 2019-05-15 17:47:40 -05:00 committed by snipe
parent 407445456a
commit e40a5a70a5
10 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/Http/Controllers/Api/AssetsController.php
View file

@ -1,6 +1,7 @@
<?php <?php
namespace App\Http\Controllers\Api; namespace App\Http\Controllers\Api;
use Illuminate\Support\Facades\Gate;
use App\Helpers\Helper; use App\Helpers\Helper;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Http\Requests\AssetCheckoutRequest; use App\Http\Requests\AssetCheckoutRequest;

2
app/Http/Requests/AssetFileRequest.php
View file

@ -24,7 +24,7 @@ class AssetFileRequest extends Request
{ {
$max_file_size = \App\Helpers\Helper::file_upload_max_size(); $max_file_size = \App\Helpers\Helper::file_upload_max_size();
return [ return [
'file.*' => 'required|mimes:png,gif,jpg,svg,jpeg,doc,docx,pdf,txt,zip,rar,xls,lic,xml|max:'.$max_file_size, 'file.*' => 'required|mimes:png,gif,jpg,svg,jpeg,doc,docx,pdf,txt,zip,rar,xls,lic,xml,rtf|max:'.$max_file_size,
]; ];
} }
} }

2
resources/lang/en-GB/general.php
View file

@ -206,7 +206,7 @@
'unknown_admin' => 'Unknown Admin', 'unknown_admin' => 'Unknown Admin',
'username_format' => 'Username Format', 'username_format' => 'Username Format',
'update' => 'Update', 'update' => 'Update',
'upload_filetypes_help' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, txt, lic, zip, and rar. Max upload size allowed is :size.', 'upload_filetypes_help' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, txt, lic, zip, rtf and rar. Max upload size allowed is :size.',
'uploaded' => 'Uploaded', 'uploaded' => 'Uploaded',
'user' => 'User', 'user' => 'User',
'accepted' => 'accepted', 'accepted' => 'accepted',

2
resources/lang/en-ID/general.php
View file

@ -206,7 +206,7 @@
'unknown_admin' => 'Admin tidak diketahui', 'unknown_admin' => 'Admin tidak diketahui',
'username_format' => 'Format nama pengguna', 'username_format' => 'Format nama pengguna',
'update' => 'Perbarui', 'update' => 'Perbarui',
'upload_filetypes_help' => 'Tipe file yang diizinkan adalah png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, dan rar. Maksimal ukuran file upload adalah :size.', 'upload_filetypes_help' => 'Tipe file yang diizinkan adalah png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rtf dan rar. Maksimal ukuran file upload adalah :size.',
'uploaded' => 'Unggah', 'uploaded' => 'Unggah',
'user' => 'Pengguna', 'user' => 'Pengguna',
'accepted' => 'diterima', 'accepted' => 'diterima',

2
resources/lang/en/general.php
View file

@ -211,7 +211,7 @@
'unknown_admin' => 'Unknown Admin', 'unknown_admin' => 'Unknown Admin',
'username_format' => 'Username Format', 'username_format' => 'Username Format',
'update' => 'Update', 'update' => 'Update',
'upload_filetypes_help' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, txt, lic, xml, zip, and rar. Max upload size allowed is :size.', 'upload_filetypes_help' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
'uploaded' => 'Uploaded', 'uploaded' => 'Uploaded',
'user' => 'User', 'user' => 'User',
'accepted' => 'accepted', 'accepted' => 'accepted',

2
resources/lang/es-CO/general.php
View file

@ -206,7 +206,7 @@
'unknown_admin' => 'Admin Desconocido', 'unknown_admin' => 'Admin Desconocido',
'username_format' => 'Formato del nombre de usuario', 'username_format' => 'Formato del nombre de usuario',
'update' => 'Actualizar', 'update' => 'Actualizar',
'upload_filetypes_help' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, txt, lic, zip, and rar. Max upload size allowed is :size.', 'upload_filetypes_help' => 'Algunos tipos de archivos permitidos son png, gif, jpg, jpeg, doc, docx, pdf, xls, txt, lic, zip, rtf y rar. Tamaño máximo permitido: :size.',
'uploaded' => 'Subido', 'uploaded' => 'Subido',
'user' => 'Usuario', 'user' => 'Usuario',
'accepted' => 'aceptado', 'accepted' => 'aceptado',

2
resources/lang/es-ES/general.php
View file

@ -206,7 +206,7 @@
'unknown_admin' => 'Admin Desconocido', 'unknown_admin' => 'Admin Desconocido',
'username_format' => 'Formato del nombre de usuario', 'username_format' => 'Formato del nombre de usuario',
'update' => 'Actualizar', 'update' => 'Actualizar',
'upload_filetypes_help' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, txt, lic, zip, and rar. Max upload size allowed is :size.', 'upload_filetypes_help' => 'Algunos tipos de archivos permitidos son png, gif, jpg, jpeg, doc, docx, pdf, xls, txt, lic, zip, rtf y rar. Tamaño máximo permitido: :size.',
'uploaded' => 'Subido', 'uploaded' => 'Subido',
'user' => 'Usuario', 'user' => 'Usuario',
'accepted' => 'aceptado', 'accepted' => 'aceptado',

2
resources/lang/es-MX/general.php
View file

@ -206,7 +206,7 @@
'unknown_admin' => 'Admin Desconocido', 'unknown_admin' => 'Admin Desconocido',
'username_format' => 'Formato del nombre de usuario', 'username_format' => 'Formato del nombre de usuario',
'update' => 'Actualizar', 'update' => 'Actualizar',
'upload_filetypes_help' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, txt, lic, zip, and rar. Max upload size allowed is :size.', 'upload_filetypes_help' => 'Algunos tipos de archivos permitidos son png, gif, jpg, jpeg, doc, docx, pdf, xls, txt, lic, zip, rtf y rar. Tamaño máximo permitido: :size.',
'uploaded' => 'Subido', 'uploaded' => 'Subido',
'user' => 'Usuario', 'user' => 'Usuario',
'accepted' => 'aceptado', 'accepted' => 'aceptado',

2
resources/lang/es-VE/general.php
View file

@ -206,7 +206,7 @@
'unknown_admin' => 'Administrador Desconocido', 'unknown_admin' => 'Administrador Desconocido',
'username_format' => 'Formato de Nombre de Usuario', 'username_format' => 'Formato de Nombre de Usuario',
'update' => 'Actualizar', 'update' => 'Actualizar',
'upload_filetypes_help' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, txt, lic, zip, and rar. Max upload size allowed is :size.', 'upload_filetypes_help' => 'Algunos tipos de archivos permitidos son png, gif, jpg, jpeg, doc, docx, pdf, xls, txt, lic, zip, rtf y rar. Tamaño máximo permitido: :size.',
'uploaded' => 'Actualizado', 'uploaded' => 'Actualizado',
'user' => 'Usuario', 'user' => 'Usuario',
'accepted' => 'aceptado', 'accepted' => 'aceptado',

2
resources/views/modals/upload-file.blade.php
View file

@ -19,7 +19,7 @@
<label class="btn btn-default"> <label class="btn btn-default">
{{ trans('button.select_file') }} {{ trans('button.select_file') }}
<input type="file" name="file[]" multiple="true" class="js-uploadFile" id="uploadFile" data-maxsize="{{ \App\Helpers\Helper::file_upload_max_size() }}" accept="image/*,.csv,.zip,.rar,.doc,.docx,.xls,.xml,.lic,.xlsx,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel,text/plain,.pdf" style="display:none"> <input type="file" name="file[]" multiple="true" class="js-uploadFile" id="uploadFile" data-maxsize="{{ \App\Helpers\Helper::file_upload_max_size() }}" accept="image/*,.csv,.zip,.rar,.doc,.docx,.xls,.xml,.lic,.xlsx,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel,text/plain,.pdf,application/rtf" style="display:none">
</label> </label>
</div> </div>