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

Merge pull request #16166 from Godmartinz/rollbar_none-qr-code

Browse source
This commit is contained in:
snipe 2025-02-04 16:16:00 +00:00 committed by GitHub
parent d906f3cf62 9a75131a98
commit 5e363f7dd4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/View/Label.php
View file

@ -118,9 +118,6 @@ class Label implements View
if ($template->getSupport2DBarcode()) { if ($template->getSupport2DBarcode()) {
$barcode2DType = $settings->label2_2d_type; $barcode2DType = $settings->label2_2d_type;
$barcode2DType = ($barcode2DType == 'default') ?
$settings->barcode_type :
$barcode2DType;
if (($barcode2DType != 'none') && (!is_null($barcode2DType))) { if (($barcode2DType != 'none') && (!is_null($barcode2DType))) {
switch ($settings->label2_2d_target) { switch ($settings->label2_2d_target) {
case 'ht_tag': case 'ht_tag':