A free open source IT asset/license management system
fixed preview fail when custom is set to default
Godfrey M6aa23cef712f
diff --git a/app/Http/Controllers/LabelsController.php b/app/Http/Controllers/LabelsController.phpindex eae3ba6be0..c426bfa043 100755--- a/app/Http/Controllers/LabelsController.php+++ b/app/Http/Controllers/LabelsController.php@@ -43,20 +43,29 @@ class LabelsController extends Controller$id = (int)str_replace('custom:', '', $labelName);$customLabel = CustomUserLabel::find($id);-+if (!$customLabel) {$template = new DefaultLabel;} else {- $baseLabel = CustomUserLabel::makeBaseLabel(- data_get($customLabel->config_snapshot, 'template', $customLabel->base_label)+ $baseTemplateName = data_get(+ $customLabel->config_snapshot,+ 'template',+ $customLabel->base_label);- $template = ($customLabel->type === 'tape')+ $template = $customLabel->type === 'tape'? new PreviewTapeLabel: new PreviewSheetLabel;- if ($baseLabel) {- $template->seedFromTemplate($baseLabel);+ if ($baseTemplateName === 'StandardTape') {+ // Nothing to seed. The custom snapshot contains+ // the tape dimensions/content/support configuration.+ } else {+ $baseLabel = CustomUserLabel::makeBaseLabel($baseTemplateName);++ if ($baseLabel) {+ $template->seedFromTemplate($baseLabel);+ }}$template->applyEditorConfig($customLabel->config_snapshot ?? []);diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.phpindex 27f6eb891b..7d8ec2f125 100644--- a/app/Http/Controllers/SettingsController.php+++ b/app/Http/Controllers/SettingsController.php@@ -36,6 +36,7 @@ use Illuminate\Validation\Rule;use League\Csv\EscapeFormula;use Symfony\Component\HttpFoundation\BinaryFileResponse;use ZipArchive;+use App\Models\Labels\CustomUserLabel;/*** This controller handles all actions related to Settings for@@ -595,6 +596,16 @@ class SettingsController extends Controllerpublic function getLabels(): View{$is_gd_installed = extension_loaded('gd');+ $setting = Setting::getSettings();++ $setting->label2_template_name = $setting->label2_template;++ if (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;+ }return view('settings.labels')->with('setting', Setting::getSettings())diff --git a/resources/views/partials/labels-new-engine.blade.php b/resources/views/partials/labels-new-engine.blade.phpindex 5fb78c3496..0cb531f6a2 100644--- a/resources/views/partials/labels-new-engine.blade.php+++ b/resources/views/partials/labels-new-engine.blade.php@@ -166,7 +166,7 @@<fieldset name="label-preview"><x-form.legend>{{ trans('admin/settings/general.label2_label_preview') }}: <code- id="label2_preview_template">{{ $setting->label2_template }}</code>+ id="label2_preview_template">{{ $setting->label2_template_name }}</code></x-form.legend><div class="col-md-12" style="margin-bottom: 10px;">@include('partials.label2-preview')diff --git a/resources/views/settings/labels.blade.php b/resources/views/settings/labels.blade.phpindex 7b8831a151..c27fd8df25 100644--- a/resources/views/settings/labels.blade.php+++ b/resources/views/settings/labels.blade.php@@ -177,29 +177,44 @@: row.name;$('input[name="label2_template"]:checked').val(value);+$('#label2_preview_template').text(row.name || value);- document.getElementById('settingsForm')?.dispatchEvent(new Event('change'));+ document.getElementById('settingsForm')+ ?.dispatchEvent(new Event('change'));});$('#label2TemplateTable').on('load-success.bs.table', function () {- const selected = $('#label2_template').val();+ // On initial load, the saved setting is the source of truth.+ const selected = @json($setting->label2_template);isPreselecting = true;- $('#label2TemplateTable').bootstrapTable('getData').forEach((row, index) => {- const value = row.source === 'custom'- ? 'custom:' + row.custom_label_id- : row.name;+ $('#label2TemplateTable')+ .bootstrapTable('getData')+ .forEach((row, index) => {+ const value = row.source === 'custom'+ ? 'custom:' + row.custom_label_id+ : row.name;- if (value === selected) {- $('#label2TemplateTable').bootstrapTable('check', index);- }- });+ if (value === selected) {+ $('#label2TemplateTable')+ .bootstrapTable('check', index);++ // check.bs.table is suppressed while preselecting,+ // so explicitly set the canonical form value here.+ $('input[name="label2_template"]:checked')+ .val(value);++ $('#label2_preview_template')+ .text(row.name || value);+ }+ });isPreselecting = false;- document.getElementById('settingsForm')?.dispatchEvent(new Event('change'));+ document.getElementById('settingsForm')+ ?.dispatchEvent(new Event('change'));});});