DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-12 14:27:33 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #2203 from dmeltzer/display-error-if-import-upload-fails

Browse source 
If the move of the uploaded import file fails, return an error message.
This commit is contained in:
snipe 2016-06-27 20:55:51 -07:00 committed by GitHub
parent e3fe80e2a5 278be52f7b
commit 6ea74f9fc3
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -833,7 +833,15 @@ class AssetsController extends Controller
$date = date('Y-m-d-his');
$fixed_filename = str_replace(' ', '-', $file->getClientOriginalName());
$file->move($path, $date.'-'.$fixed_filename);
try {
$file->move($path, $date.'-'.$fixed_filename);
} catch (\Symfony\Component\HttpFoundation\File\Exception\FileException $exception) {
$results['error']=trans('admin/hardware/message.upload.error');
if( config('app.debug')) {
$results['error'].= ' ' . $exception->getMessage();
}
return $results;
}
$name = date('Y-m-d-his').'-'.$fixed_filename;
$filesize = Setting::fileSizeConvert(filesize($path.'/'.$name));
$results[] = compact('name', 'filesize');
@ -847,7 +855,6 @@ class AssetsController extends Controller
} else {
$results['error']=trans('general.feature_disabled');
return $results;
}