mirror of
https://github.com/snipe/snipe-it.git
synced 2025-03-05 20:52:15 -08:00
clean up
This commit is contained in:
parent
388e4c10c4
commit
f7bb911b99
|
@ -578,14 +578,15 @@ class AssetsController extends Controller
|
||||||
|
|
||||||
if (($model) && ($model->fieldset)) {
|
if (($model) && ($model->fieldset)) {
|
||||||
foreach ($model->fieldset->fields as $field) {
|
foreach ($model->fieldset->fields as $field) {
|
||||||
//reduce "array to string conversion" exceptions - ideally we'd handle this in a form request, but this works for now
|
|
||||||
if(is_array($request->input($field->db_column, null))) {
|
|
||||||
return response()->json(Helper::formatStandardApiResponse('error', null, 'This custom field can not be an array', 200));
|
|
||||||
}
|
|
||||||
|
|
||||||
// Set the field value based on what was sent in the request
|
// Set the field value based on what was sent in the request
|
||||||
$field_val = $request->input($field->db_column, null);
|
$field_val = $request->input($field->db_column, null);
|
||||||
|
|
||||||
|
//reduce "array to string conversion" exceptions - ideally we'd handle this in a form request, but this works for now
|
||||||
|
if(is_array($field_val)) {
|
||||||
|
return response()->json(Helper::formatStandardApiResponse('error', null, 'This custom field can not be an array', 200));
|
||||||
|
}
|
||||||
|
|
||||||
// If input value is null, use custom field's default value
|
// If input value is null, use custom field's default value
|
||||||
if ($field_val == null) {
|
if ($field_val == null) {
|
||||||
\Log::debug('Field value for '.$field->db_column.' is null');
|
\Log::debug('Field value for '.$field->db_column.' is null');
|
||||||
|
|
Loading…
Reference in a new issue