mirror/snipe-it
3
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-10-30 03:42:35 +00:00
Code Issues Projects Releases Wiki Activity

Fixed #17316 - handle checkboxes correctly in checkin/checkout

Browse Source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2025-07-23 14:51:34 +01:00
parent e96e2461d3
commit b13e74756a
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/Models/Asset.php
View File

@ -15,6 +15,8 @@ use Carbon\Carbon;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Support\Facades\Crypt;
use Illuminate\Support\Facades\Gate;
use Illuminate\Support\Facades\Storage;
use Watson\Validating\ValidatingTrait;
use Illuminate\Database\Eloquent\Casts\Attribute;
@ -421,12 +423,34 @@ class Asset extends Depreciable
{
// Check to see if any of the custom fields were included on the form and if they have any values
if (($this->model) && ($this->model->fieldset) && ($this->model->fieldset->fields)) {
foreach ($this->model->fieldset->fields as $field) {
if (($field->{$checkin_checkout} == 1) && (request()->has($field->db_column))) {
$this->{$field->db_column} = request()->get($field->db_column);
if ($field->field_encrypted == '1') {
if (Gate::allows('assets.view.encrypted_custom_fields')) {
if (is_array(request()->input($field->db_column))) {
$this->{$field->db_column} = Crypt::encrypt(implode(', ', request()->input($field->db_column)));
} else {
$this->{$field->db_column} = Crypt::encrypt(request()->get($field->db_column));
}
}
} else {
if (is_array(request()->input($field->db_column))) {
$this->{$field->db_column} = implode(', ', request()->input($field->db_column));
} else {
$this->{$field->db_column} = request()->input($field->db_column);
}
}
}
}
}
}

4
resources/views/hardware/checkout.blade.php
View File

@ -32,7 +32,7 @@
{{ trans('general.company') }}
</label>
<div class="col-md-8">
<p class="form-control-static">
<p class="form-control-static" style="padding-top: 7px;">
{{ $asset->company->name }}
</p>
</div>
@ -45,7 +45,7 @@
{{ trans('admin/hardware/form.model') }}
</label>
<div class="col-md-8">
<p class="form-control-static">
<p class="form-control-static" style="padding-top: 7px;">
@if (($asset->model) && ($asset->model->name))
{{ $asset->model->name }}
@else