Skip to content

A free open source IT asset/license management system

Models: removes default field values from custom fields bulk editing

Godfrey M729209d45d0f
diff --git a/resources/views/models/custom_fields_form_bulk_edit.blade.php b/resources/views/models/custom_fields_form_bulk_edit.blade.php
index 8a2cc9f68c..410bac9d1f 100644
--- a/resources/views/models/custom_fields_form_bulk_edit.blade.php
+++ b/resources/views/models/custom_fields_form_bulk_edit.blade.php
@@ -44,7 +44,7 @@
<x-input.select
:name="$field->db_column_name()"
:options="$field->formatFieldValuesAsArray()"
- :selected="old($field->db_column_name(),(isset($item) ? Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : $field->defaultValue($model->id)))"
+ :selected="old($field->db_column_name(),(isset($item) ? Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : ''))"
class="format form-control"
/>
@@ -53,17 +53,17 @@
<input type="text" class="form-control" disabled value="{{ trans('/admin/hardware/form.bulk_update_custom_field_unique') }}">
@endif
@if(!$field->is_unique)
- <textarea class="col-md-6 form-control" id="{{ $field->db_column_name() }}" name="{{ $field->db_column_name() }}">{{ old($field->db_column_name(),(isset($item) ? Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : $field->defaultValue($model->id))) }}</textarea>
+ <textarea class="col-md-6 form-control" id="{{ $field->db_column_name() }}"
+ name="{{ $field->db_column_name() }}">{{ old($field->db_column_name(),(isset($item) ? Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : '')) }}</textarea>
@endif
@elseif ($field->element=='checkbox')
<!-- Checkboxes -->
@php
$fieldName = $field->db_column_name();
$oldValues = old($fieldName);
- $defaultValues = array_map('trim', explode(',', $field->defaultValue($model->id)));
- $currentValues = isset($item) ? array_map('trim', explode(',', $item->{$fieldName})) : $defaultValues;
+ $currentValues = isset($item) ? array_map('trim', explode(',', $item->{$fieldName})) : '';
- $selectedValues = is_array($oldValues) ? $oldValues : $currentValues;
+ $selectedValues = is_array($oldValues) ? $oldValues : [];
@endphp
@foreach ($field->formatFieldValuesAsArray() as $key => $value)
@@ -79,8 +79,7 @@
@php
$fieldName = $field->db_column_name();
$oldValue = old($fieldName);
- $default = trim($field->defaultValue($model->id));
- $current = isset($item) ? trim($item->{$fieldName}) : $default;
+ $current = isset($item) ? trim($item->{$fieldName}) : '';
$selectedValue = $oldValue !== null ? $oldValue : $current;
@endphp
@@ -107,7 +106,10 @@
<div class="input-group col-md-5" style="padding-left: 0px;">
<div class="input-group date" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-autoclose="true" data-date-clear-btn="true">
- <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="{{ $field->db_column_name() }}" id="{{ $field->db_column_name() }}" readonly value="{{ old($field->db_column_name(),(isset($item) ? Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : $field->defaultValue($model->id))) }}" style="background-color:inherit">
+ <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}"
+ name="{{ $field->db_column_name() }}" id="{{ $field->db_column_name() }}" readonly
+ value="{{ old($field->db_column_name(),(isset($item) ? Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : '')) }}"
+ style="background-color:inherit">
<span class="input-group-addon"><x-icon type="calendar" /></span>
</div>
</div>
@@ -118,9 +120,13 @@
@if (($field->field_encrypted=='0') || (Gate::allows('admin')))
@if ($field->is_unique)
<input type="text" class="form-control" disabled value="{{trans('/admin/hardware/form.bulk_update_custom_field_unique')}}">
- @endif
- @if(!$field->is_unique)
- <input type="text" value="{{ old($field->db_column_name(),(isset($item) ? Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : $field->defaultValue($model->id))) }}" id="{{ $field->db_column_name() }}" class="form-control" name="{{ $field->db_column_name() }}" placeholder="Enter {{ strtolower($field->format) }} text">
+ @endif
+ @if(!$field->is_unique)
+ <input type="text"
+ value="{{ old($field->db_column_name(),(isset($item) ? Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : '')) }}"
+ id="{{ $field->db_column_name() }}" class="form-control"
+ name="{{ $field->db_column_name() }}"
+ placeholder="Enter {{ strtolower($field->format) }} text">
@endif
@else
<input type="text" value="{{ strtoupper(trans('admin/custom_fields/general.encrypted')) }}" class="form-control disabled" disabled>