DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-11 16:14:18 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2023-08-15 18:55:39 +01:00
parent 28b1461cb4 d47b502d86
commit 949a88e560
2 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/SettingsController.php
View file

@ -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'));
}

26
resources/views/settings/labels.blade.php
View file

@ -40,17 +40,21 @@
<div class="col-md-11 col-md-offset-1">
<!-- New Label Engine -->
<div class="form-group {{ $errors->has('label2_enable') ? 'error' : '' }}">
<div class="col-md-3">
{{ Form::label('label2_enable', trans('admin/settings/general.label2_enable')) }}
</div>
<div class="col-md-9">
{{ Form::checkbox('label2_enable', '1', old('label2_enable', $setting->label2_enable, [ 'class'=>'minimal', 'aria-label'=>'label2_enable' ])) }}
{{ trans('general.yes') }}
{!! $errors->first('label2_enable', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
<p class="help-block">{!! trans('admin/settings/general.label2_enable_help') !!}</p>
</div>
</div>
{{-- <div class="form-group" {{ $errors->has('label2_enable') ? 'error' : '' }}">--}}
{{-- <div class="col-md-7 col-md-offset-3">--}}
{{-- <label for="label2_enable" class="form-control">--}}
{{-- <input type="checkbox" value="1" name="label2_enable" {{ (old('label2_enable', $setting->label2_enable)) == '1' ? ' checked="checked"' : '' }} aria-label="label2_enable">--}}
{{-- {{ Form::label('label2_enable', trans('admin/settings/general.label2_enable')) }}--}}
{{-- </label>--}}
{{-- {!! $errors->first('label2_enable', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}--}}
{{-- <p class="help-block">--}}
{{-- {!! trans('admin/settings/general.label2_enable_help') !!}--}}
{{-- </p>--}}
{{-- </div>--}}
{{-- </div>--}}
@if ($setting->label2_enable)
<!-- New Settings -->