A free open source IT asset/license management system
label preview on settings works with custom labels
Godfrey M4f046378c89c
diff --git a/app/Http/Controllers/LabelsController.php b/app/Http/Controllers/LabelsController.phpindex 2ebe6380c5..8ff7da9339 100755--- a/app/Http/Controllers/LabelsController.php+++ b/app/Http/Controllers/LabelsController.php@@ -32,7 +32,36 @@ class LabelsController extends Controllerpublic function show(string $labelName){$labelName = str_replace('/', '\\', $labelName);- $template = Label::find($labelName);++ if (str_starts_with($labelName, 'custom:')) {++ $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)+ );++ $template = new PreviewLabel();++ if ($baseLabel) {+ $template->seedFromTemplate($baseLabel);+ }++ $template->applyEditorConfig($customLabel->config_snapshot ?? []);+ }++ } else {++ $template = $labelName === 'DefaultLabel'+ ? new DefaultLabel()+ : Label::find($labelName);++ }+$exampleAsset = new Asset;diff --git a/resources/views/partials/label2-preview.blade.php b/resources/views/partials/label2-preview.blade.phpindex fb8bc623ab..8fcf3603e2 100644--- a/resources/views/partials/label2-preview.blade.php+++ b/resources/views/partials/label2-preview.blade.php@@ -2,7 +2,7 @@@push('css')<style>:root {- --l2p-height: 200px;+ --l2p-height: 400px;--l2p-background-color: aliceblue;}@@ -57,21 +57,21 @@},updateURL: function() {+ const settings = Object.assign({}, ...$(this._form)+ .serializeArray()+ .filter((value) => value.name.includes('label2_'))+ .map((value) => ({[value.name]: value.value}))+ );- let params = {- settings: Object.assign({}, ...$(this._form)- .serializeArray()- .filter((value, index, all) => value.name.includes('label2_'))- .map((value, index, all) => ({[value.name]: value.value}))- )- };+ const template = $('#label2_template').val() || settings.label2_template;- let template = params.settings.label2_template;if (!template) return;+ settings.label2_template = template;+this.previewURL = '{{ route("labels.show", ["labelName" => ":label"]) }}'.replace(':label', template.replaceAll('\\', '/'))- .concat('?', $.param(params), '#toolbar=0');+ .concat('?', $.param({settings: settings}), '#toolbar=0');},_previewURL: '',diff --git a/resources/views/settings/labels.blade.php b/resources/views/settings/labels.blade.phpindex 93c4e48501..1766febf17 100644--- a/resources/views/settings/labels.blade.php+++ b/resources/views/settings/labels.blade.php@@ -387,6 +387,7 @@</x-form.legend><div class="col-md-12" style="margin-bottom: 10px;">@include('partials.label2-preview')+ <input type="hidden" name="label2_template" id="label2_template" value="DefaultLabel"></div></fieldset>@@ -656,6 +657,17 @@});});+ $('#label2TemplateTable').on('check.bs.table', function (e, row) {++ const value = row.source === 'custom'+ ? 'custom:' + row.custom_label_id+ : row.name;++ $('#label2_template').val(value);+ $('#selected-template-display').text(row.name || value);++ document.getElementById('settingsForm')?.dispatchEvent(new Event('change'));+ });const deleteLabelUrlTemplate = "{{ route('settings.labels.destroy', ['label' => 'label_id']) }}";const editLabelUrlTemplate = "{{ route('settings.labels.edit', ['label' => 'label_id']) }}";