Merge remote-tracking branch 'origin/develop'

This commit is contained in:
snipe 2024-07-08 13:21:38 +01:00
commit c16db436d3

View file

@ -906,25 +906,6 @@ class AssetsController extends Controller
$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.