A free open source IT asset/license management system
add translations, remove unused route, other fixes
Godfrey M7ad25756b213
diff --git a/app/Http/Controllers/LabelsController.php b/app/Http/Controllers/LabelsController.phpindex 1fefe9b3f0..41af0874d4 100755--- a/app/Http/Controllers/LabelsController.php+++ b/app/Http/Controllers/LabelsController.php@@ -213,7 +213,7 @@ class LabelsController extends Controllerreturn redirect()->back()->with('error',- trans('admin/labels/labels.base_label_missing')+ trans('admin/labels/general.base_label_missing'));}@@ -269,7 +269,7 @@ class LabelsController extends Controllerreturn redirect()->route('settings.labels.index')- ->with('success', $label->name . ' updated successfully.');+ ->with('success', trans('admin/labels/general.updated_successfully', ['item' => $label->name]));}public function store(Request $request)@@ -332,7 +332,7 @@ class LabelsController extends Controllerif (!$baseLabel) {return redirect()->back()- ->with('error', trans('admin/labels/labels.base_label_missing'));+ ->with('error', trans('admin/labels/general.base_label_missing'));}if ($type === 'tape') {@@ -390,7 +390,7 @@ class LabelsController extends Controller]);return redirect()->route('settings.labels.index')- ->with('success', $customLabel->name . ' created successfully.');+ ->with('success', trans('admin/labels/general.created_successfully', ['item' => $customLabel->name]));}public function create(Request $request, CustomLabelImportValidator $validator)@@ -460,7 +460,7 @@ class LabelsController extends Controllerreturn redirect()->route('settings.labels.index')- ->with('success', $labelName . ' ' . trans('admin/labels/labels.label_deleted_successfully'));+ ->with('success', $labelName . ' ' . trans('admin/labels/general.label_deleted_successfully'));}public function customLabelPreview(Request $request, string $labelName)diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.phpindex 26e9949439..74836e44a0 100644--- a/app/Http/Controllers/SettingsController.php+++ b/app/Http/Controllers/SettingsController.php@@ -691,9 +691,7 @@ class SettingsController extends Controllerif ($setting->save()) {$selectedTemplate = $setting->label2_template;- CustomUserLabel::query()->update([- 'is_default' => false,- ]);+ CustomUserLabel::where('is_default', true)->update(['is_default' => false]);if (str_starts_with($selectedTemplate, 'custom:')) {$customLabelId = (int)str_replace('custom:', '', $selectedTemplate);diff --git a/resources/lang/en-US/admin/labels/general.php b/resources/lang/en-US/admin/labels/general.phpindex 2d36e5d99f..8b8ad47510 100644--- a/resources/lang/en-US/admin/labels/general.php+++ b/resources/lang/en-US/admin/labels/general.php@@ -94,6 +94,10 @@ return ['page_size' => 'Page Size','labels_per_sheet' => 'Labels Per Sheet','label_count_help' => 'Adjust the row and column count if this doesn’t match the number of labels on your sheet',+ 'base_label_missing' => 'Base label can not be found',+ 'label_deleted_successfully' => 'Label deleted successfully',+ 'created_successfully' => ' :item created successfully',+ 'updated_successfully' => ':item updated successfully',];\ No newline at end of filediff --git a/resources/views/partials/custom-label-preview.blade.php b/resources/views/partials/custom-label-preview.blade.phpindex 03f2d403d9..3509c5df8b 100644--- a/resources/views/partials/custom-label-preview.blade.php+++ b/resources/views/partials/custom-label-preview.blade.php@@ -54,7 +54,7 @@this._form = document.querySelector('.label-customizer-shell form');if (!this._form) {- console.log('custom_label_preview: form not found');+ console.warn('custom_label_preview: form not found');return;}@@ -75,7 +75,7 @@const template = payload.template;if (!template) {- console.log('custom_label_preview: missing template');+ console.warn('custom_label_preview: missing template');return;}diff --git a/routes/web.php b/routes/web.phpindex e65e0e856d..d92cfe2d4c 100644--- a/routes/web.php+++ b/routes/web.php@@ -351,8 +351,6 @@ Route::group(['prefix' => 'admin', 'middleware' => ['auth', 'authorize:superuser->name('settings.labels.update');Route::delete('settings/labels/{label}', [LabelsController::class, 'destroy'])->name('settings.labels.destroy');- Route::post('/settings/labels/import', [LabelsController::class, 'import'])- ->name('settings.labels.import');Route::get('ldap', [SettingsController::class, 'getLdapSettings'])->name('settings.ldap.index')diff --git a/tests/Feature/Settings/LabelSettingTest.php b/tests/Feature/Settings/LabelSettingTest.phpindex 7258034c95..4696bdb430 100644--- a/tests/Feature/Settings/LabelSettingTest.php+++ b/tests/Feature/Settings/LabelSettingTest.php@@ -13,4 +13,48 @@ class LabelSettingTest extends TestCase->get(route('settings.labels.index'))->assertForbidden();}++ private function previewUrl(array $query = []): string+ {+ return route('labels.customizer-preview', ['labelName' => 'DefaultLabel'] + $query);+ }++ public function test_requires_superuser(): void+ {+ $this->actingAs(User::factory()->create())+ ->get($this->previewUrl())+ ->assertForbidden();+ }++ public function test_rejects_remote_font_name(): void+ {+ $this->actingAs(User::factory()->superuser()->create())+ ->get($this->previewUrl(['content' => ['title_font' => 'http://127.0.0.1:1/x']]))+ ->assertSessionHasErrors('content.title_font');+ }++ public function test_rejects_filesystem_path_font_name(): void+ {+ $this->actingAs(User::factory()->superuser()->create())+ ->get($this->previewUrl(['content' => ['tag_font' => '/tmp/pwn']]))+ ->assertSessionHasErrors('content.tag_font');+ }++ public function test_rejects_out_of_allowlist_font_on_every_font_field(): void+ {+ $user = User::factory()->superuser()->create();++ foreach (['tag_font', 'title_font', 'field_label_font', 'field_value_font'] as $field) {+ $this->actingAs($user)+ ->get($this->previewUrl(['content' => [$field => 'notarealfont']]))+ ->assertSessionHasErrors("content.$field");+ }+ }++ public function test_allows_a_font_the_customizer_exposes(): void+ {+ $this->actingAs(User::factory()->superuser()->create())+ ->get($this->previewUrl(['content' => ['title_font' => 'freesans']]))+ ->assertSessionDoesntHaveErrors('content.title_font');+ }}