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

minor changes

Browse source
This commit is contained in:
Godfrey M 2024-02-22 11:41:04 -08:00
parent c62758c5b5
commit c0215baca5
3 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/LabelsController.php
View file

@ -27,7 +27,7 @@ class LabelsController extends Controller
public function show(string $labelName) public function show(string $labelName)
{ {
$labelName = str_replace('/', '\\', $labelName); $labelName = str_replace('/', '\\', $labelName);
$template = Label::find($labelName);// $template = Label::find($labelName);
$exampleAsset = new Asset(); $exampleAsset = new Asset();

1
app/View/Label.php
View file

@ -37,7 +37,6 @@ class Label implements View
{ {
$settings = $this->data->get('settings'); $settings = $this->data->get('settings');
$assets = $this->data->get('assets'); $assets = $this->data->get('assets');
dd($this->data);
$offset = $this->data->get('offset'); $offset = $this->data->get('offset');
$template = $this->data->get('template'); $template = $this->data->get('template');

2
resources/views/settings/labels.blade.php
View file

@ -235,7 +235,7 @@
{{ Form::hidden('label2_fields', old('label2_fields', $setting->label2_fields)) }} {{ Form::hidden('label2_fields', old('label2_fields', $setting->label2_fields)) }}
@endif @endif
@if ($setting->label2_enable) @if ($setting->label2_enable && ($setting->label2_template != 'DefaultLabel'))
<!-- Hidden version of legacy settings --> <!-- Hidden version of legacy settings -->
{{ Form::hidden('labels_per_page', old('labels_per_page', $setting->labels_per_page)) }} {{ Form::hidden('labels_per_page', old('labels_per_page', $setting->labels_per_page)) }}
{{ Form::hidden('labels_fontsize', old('labels_fontsize', $setting->labels_fontsize)) }} {{ Form::hidden('labels_fontsize', old('labels_fontsize', $setting->labels_fontsize)) }}