mirror of
https://github.com/snipe/snipe-it.git
synced 2025-01-12 14:27:33 -08:00
Remove the rule 'required' for default values, if custom field is obligatory
This commit is contained in:
parent
cca531f8ca
commit
30d0125cbd
|
@ -13,6 +13,7 @@ use Redirect;
|
||||||
use Request;
|
use Request;
|
||||||
use Storage;
|
use Storage;
|
||||||
use Symfony\Component\HttpFoundation\JsonResponse;
|
use Symfony\Component\HttpFoundation\JsonResponse;
|
||||||
|
use function JmesPath\search;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This class controls all actions related to asset models for
|
* This class controls all actions related to asset models for
|
||||||
|
@ -463,7 +464,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);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue