DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-14 01:24:06 -08:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse source
This commit is contained in:
snipe 2017-11-06 12:39:00 -08:00
parent 33de0ec8a9 6ece593629
commit 43f2a530f5
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Http/Controllers/AssetsController.php
View file

@ -930,8 +930,8 @@ class AssetsController extends Controller
$destinationPath = config('app.private_uploads').'/assets'; $destinationPath = config('app.private_uploads').'/assets';
if ($request->hasFile('image')) { if ($request->hasFile('assetfile')) {
foreach ($request->file('image') as $file) { foreach ($request->file('assetfile') as $file) {
$extension = $file->getClientOriginalExtension(); $extension = $file->getClientOriginalExtension();
$filename = 'hardware-'.$asset->id.'-'.str_random(8); $filename = 'hardware-'.$asset->id.'-'.str_random(8);
$filename .= '-'.str_slug($file->getClientOriginalName()).'.'.$extension; $filename .= '-'.str_slug($file->getClientOriginalName()).'.'.$extension;