diff --git a/app/Models/Asset.php b/app/Models/Asset.php index 6ddc597188..d0720c7938 100644 --- a/app/Models/Asset.php +++ b/app/Models/Asset.php @@ -199,6 +199,12 @@ class Asset extends Depreciable } } + foreach ($this->model->fieldset->fields as $field){ + if($field->format == 'BOOLEAN'){ + $this->{$field->db_column} = filter_var($this->{$field->db_column}, FILTER_VALIDATE_BOOLEAN); + } + } + return parent::save($params); } diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php index 7bc948960b..7e5bc97b45 100755 --- a/resources/views/hardware/view.blade.php +++ b/resources/views/hardware/view.blade.php @@ -452,7 +452,9 @@ @endcan @else - @if (($field->format=='URL') && ($asset->{$field->db_column_name()}!='')) + @if (($field->format=='BOOLEAN') && ($asset->{$field->db_column_name()}!='')) + {!! ($asset->{$field->db_column_name()} == 1) ? "" : "" !!} + @elseif (($field->format=='URL') && ($asset->{$field->db_column_name()}!='')) {{ $asset->{$field->db_column_name()} }} @elseif (($field->format=='DATE') && ($asset->{$field->db_column_name()}!='')) {{ \App\Helpers\Helper::getFormattedDateObject($asset->{$field->db_column_name()}, 'date', false) }} diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php index 72927026ae..9e29fa3f22 100644 --- a/resources/views/partials/bootstrap-table.blade.php +++ b/resources/views/partials/bootstrap-table.blade.php @@ -442,6 +442,8 @@ if ((row.custom_fields[field_column_plain].field_format) && (row.custom_fields[field_column_plain].value)) { if (row.custom_fields[field_column_plain].field_format=='URL') { return '' + row.custom_fields[field_column_plain].value + ''; + }else if (row.custom_fields[field_column_plain].field_format=='BOOLEAN') { + return (row.custom_fields[field_column_plain].value == 1) ? "" : ""; } else if (row.custom_fields[field_column_plain].field_format=='EMAIL') { return '' + row.custom_fields[field_column_plain].value + ''; }