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

Merge pull request #16167 from Godmartinz/asset_controller_qr_check_fix

Browse source 
Adds qr code type check in getQRCode method
This commit is contained in:
snipe 2025-02-06 10:18:34 +00:00 committed by GitHub
parent a722eca6aa ddc22b4d6b
commit b195168c83
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/Assets/AssetsController.php
View file

@ -535,7 +535,7 @@ class AssetsController extends Controller
{
$settings = Setting::getSettings();
if ($settings->qr_code == '1') {
if (($settings->qr_code === '1') && ($settings->label2_2d_type !== 'none')) {
$asset = Asset::withTrashed()->find($assetId);
if ($asset) {
$size = Helper::barcodeDimensions($settings->label2_2d_type);