DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-02 08:21:09 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #11724 from inietov/fixes/remove_required_rule_for_default_custom_values

Browse source 
Fixed Validation error when creating custom fields' default values
This commit is contained in:
snipe 2022-08-24 16:44:46 -07:00 committed by GitHub
parent 1a47e1000d 6e85c2e5cb
commit 74f5980af7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/Http/Controllers/AssetModelsController.php
View file

@ -463,7 +463,18 @@ class AssetModelsController extends Controller
$data[$customField->db_column] = $defaultValue; $data[$customField->db_column] = $defaultValue;
} }
$rules = $model->fieldset->validation_rules(); $fieldsets = $model->fieldset->validation_rules();
$rules = array();
foreach ($fieldsets as $fieldset => $validation){
// If the field is marked as required, eliminate the rule so it doesn't interfere with the default values
// (we are at model level, the rule still applies when creating a new asset using this model)
$index = array_search('required', $validation);
if ($index !== false){
unset($validation[$index]);
}
$rules[$fieldset] = $validation;
}
$validator = Validator::make($data, $rules); $validator = Validator::make($data, $rules);