A free open source IT asset/license management system
prevent deletion of default labels, rename page field labels, add page sizes to suppertedPageSizes
Godfrey M9b738e62775a
diff --git a/app/Http/Controllers/LabelsController.php b/app/Http/Controllers/LabelsController.phpindex d567a3db80..37b07f549c 100755--- a/app/Http/Controllers/LabelsController.php+++ b/app/Http/Controllers/LabelsController.php@@ -410,10 +410,8 @@ class LabelsController extends Controller{$labelName = $label->name;if ($label->is_default) {- return response()->json([- 'status' => 'error',- 'message' => trans('admin/labels/labels.default_label_cannot_be_deleted'),- ], 403);+ return redirect()->route('settings.labels.index')+ ->with('warning', "$labelName can not be deleted. It is currently a default label.");}$label->delete();diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.phpindex 7d8ec2f125..06e58a3be9 100644--- a/app/Http/Controllers/SettingsController.php+++ b/app/Http/Controllers/SettingsController.php@@ -689,6 +689,19 @@ class SettingsController extends Controller}if ($setting->save()) {+ $selectedTemplate = $setting->label2_template;++ CustomUserLabel::query()->update([+ 'is_default' => false,+ ]);++ if (str_starts_with($selectedTemplate, 'custom:')) {+ $customLabelId = (int)str_replace('custom:', '', $selectedTemplate);++ CustomUserLabel::whereKey($customLabelId)->update([+ 'is_default' => true,+ ]);+ }return redirect()->route('settings.labels.index')->with('success', trans('admin/settings/message.update.success'));diff --git a/app/Models/Labels/CustomLabels/Concerns/HasCustomLabelEditorSections.php b/app/Models/Labels/CustomLabels/Concerns/HasCustomLabelEditorSections.phpindex 26c2aa3c29..00f6bb36d9 100644--- a/app/Models/Labels/CustomLabels/Concerns/HasCustomLabelEditorSections.php+++ b/app/Models/Labels/CustomLabels/Concerns/HasCustomLabelEditorSections.php@@ -140,6 +140,29 @@ trait HasCustomLabelEditorSections],],],+ 'logo' => [+ 'label' => trans('admin/labels/general.groups.logo'),+ 'toggle' => 'supports.logo',+ 'fields' => [+ 'logo_max_width' => [+ 'type' => 'number',+ 'label' => trans('admin/labels/general.fields.logo_max_width'),+ ],+ 'logo_margin' => [+ 'type' => 'number',+ 'label' => trans('admin/labels/general.fields.logo_margin'),+ ],+ 'logo_h_align' => [+ 'type' => 'select',+ 'label' => trans('admin/labels/general.fields.logo_h_align'),+ 'options' => [+ 'L' => trans('admin/labels/general.options.left'),+ 'C' => trans('admin/labels/general.options.center'),+ 'R' => trans('admin/labels/general.options.right'),+ ],+ ],+ ],+ ],'title' => ['label' => trans('admin/labels/general.groups.title'),@@ -230,30 +253,6 @@ trait HasCustomLabelEditorSections],],],-- 'logo' => [- 'label' => trans('admin/labels/general.groups.logo'),- 'toggle' => 'supports.logo',- 'fields' => [- 'logo_max_width' => [- 'type' => 'number',- 'label' => trans('admin/labels/general.fields.logo_max_width'),- ],- 'logo_margin' => [- 'type' => 'number',- 'label' => trans('admin/labels/general.fields.logo_margin'),- ],- 'logo_h_align' => [- 'type' => 'select',- 'label' => trans('admin/labels/general.fields.logo_h_align'),- 'options' => [- 'L' => trans('admin/labels/general.options.left'),- 'C' => trans('admin/labels/general.options.center'),- 'R' => trans('admin/labels/general.options.right'),- ],- ],- ],- ],],],];diff --git a/app/Models/Labels/RectangleSheet.php b/app/Models/Labels/RectangleSheet.phpindex 2ba05701af..dd8b909c6f 100644--- a/app/Models/Labels/RectangleSheet.php+++ b/app/Models/Labels/RectangleSheet.php@@ -82,13 +82,13 @@ abstract class RectangleSheet extends Sheet{return ['letter' => [- 'name' => 'Letter',+ 'name' => 'Letter (215.9mm x 279.4mm)','width' => 215.9,'height' => 279.4,'unit' => 'mm',],'a4' => [- 'name' => 'A4',+ 'name' => 'A4 (210mm x 297mm)','width' => 210.0,'height' => 297.0,'unit' => 'mm',diff --git a/resources/lang/en-US/admin/labels/general.php b/resources/lang/en-US/admin/labels/general.phpindex 34381d2353..c3ef3f0030 100644--- a/resources/lang/en-US/admin/labels/general.php+++ b/resources/lang/en-US/admin/labels/general.php@@ -21,8 +21,8 @@ return [],'fields' => [- 'width' => 'Label Width',- 'height' => 'Label Height',+ 'width' => 'Page Width',+ 'height' => 'Page Height','label_gap' => 'Label Gap','margin_top' => 'Top Margin','margin_right' => 'Right Margin',diff --git a/resources/views/livewire/labels/new-label-setup.blade.php b/resources/views/livewire/labels/new-label-setup.blade.phpindex b90fd9b3b2..00c6de77cf 100644--- a/resources/views/livewire/labels/new-label-setup.blade.php+++ b/resources/views/livewire/labels/new-label-setup.blade.php@@ -51,9 +51,13 @@</div></div></div>-+ <label>+ Unit: mm (applies to all dimensions)+ </label>+ <br><br>@if ($type === 'sheet')<div id="sheet-options">+<div class="form-group"><label>{{ trans('admin/labels/general.page_size') }}</label>