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 2 Packages Projects Releases Wiki Activity

Merge pull request #14362 from Godmartinz/labels-not-generating-properly

Browse source 
Fixes inconsistencies with generating labels
This commit is contained in:
snipe 2024-03-04 18:49:44 +00:00 committed by GitHub
parent 9419c7fdeb e926db76a0
commit 9a5c1b8126
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/View/Label.php
View file

@ -38,7 +38,7 @@ class Label implements View
$settings = $this->data->get('settings'); $settings = $this->data->get('settings');
$assets = $this->data->get('assets'); $assets = $this->data->get('assets');
$offset = $this->data->get('offset'); $offset = $this->data->get('offset');
$template = $this->data->get('template'); $template = LabelModel::find($settings->label2_template);
// If disabled, pass to legacy view // If disabled, pass to legacy view
if ((!$settings->label2_enable) && (!$template)) { if ((!$settings->label2_enable) && (!$template)) {
@ -49,13 +49,6 @@ class Label implements View
->with('count', $this->data->get('count')); ->with('count', $this->data->get('count'));
} }
// If a specific template was set, use it, otherwise fall back to default
if (empty($template)) {
$template = LabelModel::find($settings->label2_template);
} elseif (is_string($template)) {
$template = LabelModel::find($template);
}
$template->validate(); $template->validate();
$pdf = new TCPDF( $pdf = new TCPDF(