From 5eb08d9568f59e29d8522476a1903b48780d1d87 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Mon, 11 Dec 2023 11:14:55 -0800 Subject: [PATCH 1/7] added a missing table header for checkout --- resources/views/hardware/requested.blade.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/views/hardware/requested.blade.php b/resources/views/hardware/requested.blade.php index dcc8a0193646..83ea30090f30 100644 --- a/resources/views/hardware/requested.blade.php +++ b/resources/views/hardware/requested.blade.php @@ -46,7 +46,8 @@ class="table table-striped snipe-table" {{ trans('admin/hardware/form.expected_checkin') }} {{ trans('admin/hardware/table.requesting_user') }} {{ trans('admin/hardware/table.requested_date') }} - {{ trans('button.actions') }} + {{ trans('button.actions') }} + {{ trans('general.checkout') }} From 016ca1adc10a562e0e166dfe1b57a69fdf21a025 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 13 Dec 2023 06:27:50 +0000 Subject: [PATCH 2/7] Fixed HTML for checkboxes Signed-off-by: snipe --- .../Controllers/AssetModelsController.php | 16 ++-- ...eld-set-default-values-for-model.blade.php | 80 ++++++++++++------- 2 files changed, 57 insertions(+), 39 deletions(-) diff --git a/app/Http/Controllers/AssetModelsController.php b/app/Http/Controllers/AssetModelsController.php index a3afc4f00d1f..5ac958a8ac55 100755 --- a/app/Http/Controllers/AssetModelsController.php +++ b/app/Http/Controllers/AssetModelsController.php @@ -88,7 +88,7 @@ public function store(ImageUploadRequest $request) $model->requestable = Request::has('requestable'); if ($request->input('fieldset_id') != '') { - $model->fieldset_id = e($request->input('fieldset_id')); + $model->fieldset_id = $request->input('fieldset_id'); } $model = $request->handleImages($model); @@ -101,7 +101,6 @@ public function store(ImageUploadRequest $request) } } - // Redirect to the new model page return redirect()->route('models.index')->with('success', trans('admin/models/message.create.success')); } @@ -166,17 +165,14 @@ public function update(ImageUploadRequest $request, $modelId = null) $this->removeCustomFieldsDefaultValues($model); - if ($request->input('fieldset_id') == '') { - $model->fieldset_id = null; - } else { - $model->fieldset_id = $request->input('fieldset_id'); + $model->fieldset_id = $request->input('fieldset_id'); - if ($this->shouldAddDefaultValues($request->input())) { - if (!$this->assignCustomFieldsDefaultValues($model, $request->input('default_values'))){ - return redirect()->back()->withInput()->with('error', trans('admin/custom_fields/message.fieldset_default_value.error')); - } + if ($this->shouldAddDefaultValues($request->input())) { + if (!$this->assignCustomFieldsDefaultValues($model, $request->input('default_values'))){ + return redirect()->back()->withInput()->with('error', trans('admin/custom_fields/message.fieldset_default_value.error')); } } + diff --git a/resources/views/livewire/custom-field-set-default-values-for-model.blade.php b/resources/views/livewire/custom-field-set-default-values-for-model.blade.php index 19b2b4dbe391..d24b39b1405d 100644 --- a/resources/views/livewire/custom-field-set-default-values-for-model.blade.php +++ b/resources/views/livewire/custom-field-set-default-values-for-model.blade.php @@ -1,54 +1,77 @@ - {{-- This doesn't seem to fix it, neither does a div? --}} + +
- -
- {{ Form::select('fieldset_id', Helper::customFieldsetList(), old('fieldset_id', $fieldset_id), array('class'=>'select2 js-fieldset-field livewire-select2', 'style'=>'width:100%; min-width:350px', 'aria-label'=>'custom_fieldset', 'data-livewire-component' => $_instance->id)) }} - {!! $errors->first('custom_fieldset', '') !!} -
-
- -
+ +
+ {{ Form::select('fieldset_id', Helper::customFieldsetList(), old('fieldset_id', $fieldset_id), array('class'=>'select2 js-fieldset-field livewire-select2', 'style'=>'width:100%; min-width:350px', 'aria-label'=>'custom_fieldset', 'data-livewire-component' => $_instance->id)) }} + {!! $errors->first('custom_fieldset', '') !!} +
+
+ +
+ @if ($this->add_default_values ) {{-- 'if the checkbox is enabled *AND* there are more than 0 fields in the fieldsset' --}} -
-
@if ($fields) + @foreach ($fields as $field)
- - -
+ + +
+ @if ($field->format == "DATE") +
+ @elseif ($field->element == "text") - + + + + + @elseif($field->element == "textarea") -
+ + + + + @elseif($field->element == "listbox") - + + + + @elseif($field->element == "radio") @foreach(explode("\r\n", $field->field_values) as $field_value) defaultValue($model_id) == $field_value ? 'checked="checked"': '' }} />{{ $field_value }}
@endforeach + @elseif($field->element == "checkbox") - @foreach(explode("\r\n", $field->field_values) as $field_value) - defaultValue($model_id))) ? 'checked="checked"': '' }} /> {{ $field_value }}
+ + @foreach(explode("\r\n", $field->field_values) as $field_value) + @endforeach + + @else Unknown field element: {{ $field->element }} @@ -58,9 +81,8 @@
@endforeach +
@endif -
-
@endif From 383422158939041469214b7aa32429b75767bef8 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 13 Dec 2023 06:30:08 +0000 Subject: [PATCH 3/7] Fixed radio button display Signed-off-by: snipe --- .../custom-field-set-default-values-for-model.blade.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/resources/views/livewire/custom-field-set-default-values-for-model.blade.php b/resources/views/livewire/custom-field-set-default-values-for-model.blade.php index d24b39b1405d..2efbfc03d4a4 100644 --- a/resources/views/livewire/custom-field-set-default-values-for-model.blade.php +++ b/resources/views/livewire/custom-field-set-default-values-for-model.blade.php @@ -59,15 +59,17 @@ @elseif($field->element == "radio") + @foreach(explode("\r\n", $field->field_values) as $field_value) - defaultValue($model_id) == $field_value ? 'checked="checked"': '' }} />{{ $field_value }}
+