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

Don't add data if it's not there

Browse source
This commit is contained in:
Cram42 2022-11-02 16:05:52 +08:00
parent a8b6a4a259
commit 06ce40ac08
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/View/Label.php
View file

@ -112,14 +112,14 @@ class Label implements View
$assetData->put('tag', $asset->asset_tag); $assetData->put('tag', $asset->asset_tag);
if ($template->getSupportTitle()) { if ($template->getSupportTitle()) {
$assetData->put('title', !empty($settings->label2_title) ? $title = !empty($settings->label2_title) ?
str_ireplace(':company', $asset->company->name, $settings->label2_title) : str_ireplace(':company', $asset->company->name, $settings->label2_title) :
$settings->qr_text $settings->qr_text;
); if (!empty($title)) $assetData->put('title', $title);
} }
if ($template->getSupportLogo()) { if ($template->getSupportLogo()) {
$assetData->put('logo', $settings->label2_asset_logo ? $logo = $settings->label2_asset_logo ?
( (
!empty($asset->company->image) ? !empty($asset->company->image) ?
Storage::disk('public')->path('companies/'.e($asset->company->image)) : Storage::disk('public')->path('companies/'.e($asset->company->image)) :
@ -129,8 +129,8 @@ class Label implements View
!empty($settings->label_logo) ? !empty($settings->label_logo) ?
Storage::disk('public')->path(''.e($settings->label_logo)) : Storage::disk('public')->path(''.e($settings->label_logo)) :
null null
) );
); if (!empty($logo)) $assetData->put('logo', $logo);
} }
if ($template->getSupport1DBarcode()) { if ($template->getSupport1DBarcode()) {
@ -138,7 +138,7 @@ class Label implements View
$barcode1DType = ($barcode1DType == 'default') ? $barcode1DType = ($barcode1DType == 'default') ?
(($settings->alt_barcode_enabled) ? $settings->alt_barcode : null) : (($settings->alt_barcode_enabled) ? $settings->alt_barcode : null) :
$barcode1DType; $barcode1DType;
if ($barcode1DType) { if ($barcode1DType != 'none') {
$assetData->put('barcode1d', (object)[ $assetData->put('barcode1d', (object)[
'type' => $barcode1DType, 'type' => $barcode1DType,
'content' => $asset->asset_tag, 'content' => $asset->asset_tag,
@ -151,7 +151,7 @@ class Label implements View
$barcode2DType = ($barcode2DType == 'default') ? $barcode2DType = ($barcode2DType == 'default') ?
(($settings->qr_code) ? $settings->barcode_type : null) : (($settings->qr_code) ? $settings->barcode_type : null) :
$barcode2DType; $barcode2DType;
if ($barcode2DType) { if ($barcode2DType != 'none') {
switch ($settings->label2_2d_target) { switch ($settings->label2_2d_target) {
case 'ht_tag': $barcode2DTarget = route('ht/assetTag', $asset->asset_tag); break; case 'ht_tag': $barcode2DTarget = route('ht/assetTag', $asset->asset_tag); break;
case 'hardware_id': case 'hardware_id':