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

Merge branch 'develop'

Browse source
This commit is contained in:
snipe 2018-04-24 13:24:24 -07:00
parent a0706b8780 0e1dfcf408
commit 088eb3da14
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

@ -1020,7 +1020,7 @@ class AssetsController extends Controller
$file = $log->get_src('assets'); $file = $log->get_src('assets');
if ($log->action_type =='audit') { if ($log->action_type =='audit') {
$file = $log->get_src('assets/audits'); $file = $log->get_src('audits');
} }
$filetype = Helper::checkUploadIsImage($file); $filetype = Helper::checkUploadIsImage($file);
@ -1328,7 +1328,7 @@ class AssetsController extends Controller
if ($request->hasFile('image')) { if ($request->hasFile('image')) {
$file = $request->file('image'); $file = $request->file('image');
try { try {
$destinationPath = config('app.private_uploads').'/assets/audits'; $destinationPath = config('app.private_uploads').'/audits';
$extension = $file->getClientOriginalExtension(); $extension = $file->getClientOriginalExtension();
$filename = 'audit-'.$asset->id.'-'.str_slug(basename($file->getClientOriginalName(), '.'.$extension)).'.'.$extension; $filename = 'audit-'.$asset->id.'-'.str_slug(basename($file->getClientOriginalName(), '.'.$extension)).'.'.$extension;
$file->move($destinationPath, $filename); $file->move($destinationPath, $filename);