From cb608d7fd16d21e1b24c40a4150ade033f49270b Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 3 Jun 2025 11:58:57 -0700 Subject: [PATCH 1/2] testing buttons out --- .../models/custom_fields_form_bulk_edit.blade.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) 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 cea495ccd2..68a42a8006 100644 --- a/resources/views/models/custom_fields_form_bulk_edit.blade.php +++ b/resources/views/models/custom_fields_form_bulk_edit.blade.php @@ -30,6 +30,9 @@ :selected="old($field->db_column_name(),(isset($item) ? Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : $field->defaultValue($model->id)))" class="format form-control" /> + @elseif ($field->element=='textarea') @if($field->is_unique) @@ -45,7 +48,9 @@ {$field->db_column_name()}))) ? ' checked="checked"' : '') : (old($field->db_column_name()) != '' ? ' checked="checked"' : (in_array($key, array_map('trim', explode(',', $field->defaultValue($model->id)))) ? ' checked="checked"' : '')) }}> {{ $value }} - + @endforeach @elseif ($field->element=='radio') @foreach ($field->formatFieldValuesAsArray() as $value) @@ -54,7 +59,9 @@ {$field->db_column_name()} == $value ? ' checked="checked"' : '') : (old($field->db_column_name()) != '' ? ' checked="checked"' : (in_array($value, explode(', ', $field->defaultValue($model->id))) ? ' checked="checked"' : '')) }}> {{ $value }} - + @endforeach @endif From 6beccc5e6019fc21c108ededb80bf02b8cd7f49a Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Wed, 4 Jun 2025 10:24:45 -0700 Subject: [PATCH 2/2] adds clear ability to custom radio buttons --- .../lang/en-US/admin/hardware/general.php | 1 + resources/views/hardware/bulk.blade.php | 13 +++++++++++ .../custom_fields_form_bulk_edit.blade.php | 23 ++++++++----------- 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/resources/lang/en-US/admin/hardware/general.php b/resources/lang/en-US/admin/hardware/general.php index 6740476574..bc972da290 100644 --- a/resources/lang/en-US/admin/hardware/general.php +++ b/resources/lang/en-US/admin/hardware/general.php @@ -9,6 +9,7 @@ return [ 'bulk_checkin' => 'Bulk Checkin', 'checkin' => 'Checkin Asset', 'checkout' => 'Checkout Asset', + 'clear' => 'Clear', 'clone' => 'Clone Asset', 'deployable' => 'Deployable', 'deleted' => 'This asset has been deleted.', diff --git a/resources/views/hardware/bulk.blade.php b/resources/views/hardware/bulk.blade.php index e3cc9f5388..77c3173f5a 100755 --- a/resources/views/hardware/bulk.blade.php +++ b/resources/views/hardware/bulk.blade.php @@ -266,3 +266,16 @@ @stop +@section('moar_scripts') + +@endsection 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 68a42a8006..3efca73258 100644 --- a/resources/views/models/custom_fields_form_bulk_edit.blade.php +++ b/resources/views/models/custom_fields_form_bulk_edit.blade.php @@ -30,17 +30,14 @@ :selected="old($field->db_column_name(),(isset($item) ? Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : $field->defaultValue($model->id)))" class="format form-control" /> - @elseif ($field->element=='textarea') @if($field->is_unique) @endif - @if(!$field->is_unique) + @if(!$field->is_unique) - @endif + @endif @elseif ($field->element=='checkbox') @foreach ($field->formatFieldValuesAsArray() as $key => $value) @@ -48,9 +45,7 @@ {$field->db_column_name()}))) ? ' checked="checked"' : '') : (old($field->db_column_name()) != '' ? ' checked="checked"' : (in_array($key, array_map('trim', explode(',', $field->defaultValue($model->id)))) ? ' checked="checked"' : '')) }}> {{ $value }} - + @endforeach @elseif ($field->element=='radio') @foreach ($field->formatFieldValuesAsArray() as $value) @@ -59,11 +54,13 @@ {$field->db_column_name()} == $value ? ' checked="checked"' : '') : (old($field->db_column_name()) != '' ? ' checked="checked"' : (in_array($value, explode(', ', $field->defaultValue($model->id))) ? ' checked="checked"' : '')) }}> {{ $value }} - - @endforeach + @endforeach + @endif @else @@ -126,4 +123,4 @@ @endforeach @endif - @endforeach + @endforeach