lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Better error handling for qr codes on invalid assets

Browse source
This commit is contained in:
snipe 2017-11-08 01:04:14 -08:00
parent d1022e8ff7
commit a3e80882c1
1 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -666,6 +666,7 @@ class AssetsController extends Controller
if ($settings->qr_code == '1') { if ($settings->qr_code == '1') {
$asset = Asset::withTrashed()->find($assetId); $asset = Asset::withTrashed()->find($assetId);
if ($asset) {
$size = Helper::barcodeDimensions($settings->barcode_type); $size = Helper::barcodeDimensions($settings->barcode_type);
$qr_file = public_path().'/uploads/barcodes/qr-'.str_slug($asset->asset_tag).'-'.str_slug($asset->id).'.png'; $qr_file = public_path().'/uploads/barcodes/qr-'.str_slug($asset->asset_tag).'-'.str_slug($asset->id).'.png';
@ -681,6 +682,8 @@ class AssetsController extends Controller
} }
} }
} }
return 'That asset is invalid';
}
} }