DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-12 14:27:33 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #12197 from inietov/fixes/custom_regex_defaults_to_any

Browse source 
Fixed #11682  Custom field type of CUSTOM REGEX defaults back to ANY on editing
This commit is contained in:
snipe 2022-12-05 13:24:22 -08:00 committed by GitHub
parent 7518cab7c8 8d36971c8b
commit 9ca40716ce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
resources/views/custom_fields/fields/edit.blade.php
View file

@ -74,8 +74,14 @@
<label for="format" class="col-md-4 control-label">
{{ trans('admin/custom_fields/general.field_format') }}
</label>
@php
$field_format = '';
if (stripos($field->format, 'regex') === 0){
$field_format = 'CUSTOM REGEX';
}
@endphp
<div class="col-md-6 required">
{{ Form::select("format",Helper::predefined_formats(), $field->format, array('class'=>'format select2 form-control', 'aria-label'=>'format')) }}
{{ Form::select("format",Helper::predefined_formats(), ($field_format == '') ? $field->format : $field_format, array('class'=>'format select2 form-control', 'aria-label'=>'format')) }}
{!! $errors->first('format', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
</div>
</div>