A free open source IT asset/license management system
small corrections
Godfrey M0d65f41f64c7
diff --git a/app/Http/Controllers/LabelsController.php b/app/Http/Controllers/LabelsController.phpindex c96fa435fe..99946df084 100755--- a/app/Http/Controllers/LabelsController.php+++ b/app/Http/Controllers/LabelsController.php@@ -437,7 +437,7 @@ class LabelsController extends Controller$label = new PreviewTapeLabel(width: (float)$validated['label_width'],height: (float)$validated['label_height'],- labelGap: (float)$validated['label_gap'] ?? 0,+ labelGap: (float)($validated['label_gap'] ?? 0),);}$config = $label->toEditorConfig();diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.phpindex 1b2211ef57..df3d0a6850 100644--- a/app/Http/Controllers/SettingsController.php+++ b/app/Http/Controllers/SettingsController.php@@ -601,12 +601,12 @@ class SettingsController extends Controllerif (str_starts_with($setting->label2_template, 'custom:')) {$customLabelId = (int)str_replace('custom:', '', $setting->label2_template);- $setting->label2_template_name = CustomUserLabel::find($customLabelId)->name+ $setting->label2_template_name = CustomUserLabel::find($customLabelId)?->name?? $setting->label2_template;}return view('settings.labels')- ->with('setting', Setting::getSettings())+ ->with('setting', $setting)->with('is_gd_installed', $is_gd_installed)->with('customFields', CustomField::where('field_encrypted', '=', 0)->get());}