DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #15043 from snipe/fixes/custom_fields_on_audit

Browse source 
Fixed #15037 - Removed custom fieldsets on auditing - it’s not used (yet)
This commit is contained in:
snipe 2024-07-08 13:20:59 +01:00 committed by GitHub
parent edd61705dc eba24b9242
commit ac9df2fc08
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 1 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
app/Http/Controllers/Assets/AssetsController.php
View file

@ -905,26 +905,7 @@ class AssetsController extends Controller
if ($request->input('update_location') == '1') {
$asset->location_id = $request->input('location_id');
}
if (($asset->model->fieldset)) {
foreach ($asset->model->fieldset->fields as $field) {
if ($field->field_encrypted == '1') {
if (Gate::allows('admin')) {
if (is_array($request->input($field->db_column))) {
$asset->{$field->db_column} = Crypt::encrypt(implode(', ', $request->input($field->db_column)));
} else {
$asset->{$field->db_column} = Crypt::encrypt($request->input($field->db_column));
}
}
} else {
if (is_array($request->input($field->db_column))) {
$asset->{$field->db_column} = implode(', ', $request->input($field->db_column));
} else {
$asset->{$field->db_column} = $request->input($field->db_column);
}
}
}
}
/**
* Invoke Watson Validating to check the asset itself and check to make sure it saved correctly.