From 64342838fd6e2dd27c4f459e027778544f7a2668 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 15 Aug 2023 18:48:12 +0100 Subject: [PATCH 1/2] Return the user to the labels page on save Signed-off-by: snipe --- app/Http/Controllers/SettingsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php index f8c063842..497ab7cea 100755 --- a/app/Http/Controllers/SettingsController.php +++ b/app/Http/Controllers/SettingsController.php @@ -883,7 +883,7 @@ class SettingsController extends Controller } if ($setting->save()) { - return redirect()->route('settings.index') + return redirect()->route('settings.labels.index') ->with('success', trans('admin/settings/message.update.success')); } From 6b02184e992b211d5c8b64d5564c1bb626790c72 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 15 Aug 2023 18:48:20 +0100 Subject: [PATCH 2/2] Fixed weird layout with checkbox Signed-off-by: snipe --- resources/views/settings/labels.blade.php | 26 +++++++++++++---------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/resources/views/settings/labels.blade.php b/resources/views/settings/labels.blade.php index ae9bfc3a6..b61794c9e 100644 --- a/resources/views/settings/labels.blade.php +++ b/resources/views/settings/labels.blade.php @@ -40,17 +40,21 @@
-
-
- {{ Form::label('label2_enable', trans('admin/settings/general.label2_enable')) }} -
-
- {{ Form::checkbox('label2_enable', '1', old('label2_enable', $setting->label2_enable, [ 'class'=>'minimal', 'aria-label'=>'label2_enable' ])) }} - {{ trans('general.yes') }} - {!! $errors->first('label2_enable', '') !!} -

{!! trans('admin/settings/general.label2_enable_help') !!}

-
-
+{{--
has('label2_enable') ? 'error' : '' }}">--}} +{{--
--}} +{{-- --}} +{{-- {!! $errors->first('label2_enable', '') !!}--}} +{{--

--}} +{{-- {!! trans('admin/settings/general.label2_enable_help') !!}--}} +{{--

--}} + +{{--
--}} +{{--
--}} + @if ($setting->label2_enable)