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

Added support for radio buttons in Custom Fields. (#9053)

Browse source
This commit is contained in:
Ivan Nieto 2021-01-27 16:41:58 -06:00 committed by GitHub
parent fb482b0dd6
commit 6772835efc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Models/CustomField.php
View file

@ -287,7 +287,7 @@ class CustomField extends Model
{ {
$arr = preg_split("/\\r\\n|\\r|\\n/", $this->field_values); $arr = preg_split("/\\r\\n|\\r|\\n/", $this->field_values);
if (($this->element!='checkbox') && ($this->element!='checkbox')) { if (($this->element!='checkbox') && ($this->element!='radio')) {
$result[''] = 'Select '.strtolower($this->format); $result[''] = 'Select '.strtolower($this->format);
} }

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

@ -70,7 +70,7 @@
</div> </div>
<!-- Format --> <!-- Format -->
<div class="form-group {{ $errors->has('format') ? ' has-error' : '' }}"> <div class="form-group {{ $errors->has('format') ? ' has-error' : '' }}" id="format_values">
<label for="format" class="col-md-4 control-label"> <label for="format" class="col-md-4 control-label">
{{ trans('admin/custom_fields/general.field_format') }} {{ trans('admin/custom_fields/general.field_format') }}
</label> </label>
@ -168,6 +168,17 @@
}); });
}).change(); }).change();
// If the element is a radiobutton, doesn't show the format input box
$(".field_element").change(function(){
$(this).find("option:selected").each(function(){
if (($(this).attr("value") != "radio")){
$("#format_values").show();
} else{
$("#format_values").hide();
}
});
}).change();
// Only display the field element if the type is not text // Only display the field element if the type is not text
$(".field_element").change(function(){ $(".field_element").change(function(){
$(this).find("option:selected").each(function(){ $(this).find("option:selected").each(function(){

11
resources/views/models/custom_fields_form.blade.php
View file

@ -27,6 +27,17 @@
</div> </div>
@endforeach @endforeach
@elseif ($field->element=='radio')
@foreach ($field->formatFieldValuesAsArray() as $value)
<div>
<label>
<input type="radio" value="{{ $value }}" name="{{ $field->db_column_name() }}" class="minimal" {{ isset($item) ? ($item->{$field->db_column_name()} == $value ? ' checked="checked"' : '') : (Request::old($field->db_column_name()) != '' ? ' checked="checked"' : '') }}>
{{ $value }}
</label>
</div>
@endforeach
@endif @endif