matt/opnform-host-nginx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Evaluate custom validation rules first (#655)

Browse Source
This commit is contained in:
Chirag Chhatrala
2024-12-30 15:30:10 +05:30
committed by GitHub
parent 1bddafbb3e
commit 3d9bc60ca1
2 changed files with 55 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
api/app/Http/Requests/AnswerFormRequest.php
View File

@@ -63,8 +63,14 @@ class AnswerFormRequest extends FormRequest
$property['logic'] = false;
}*/
// For get values instead of Id for select/multi select options
$data = $this->toArray();
// User custom validation
if (!(Str::of($property['type'])->startsWith('nf-')) && isset($property['validation'])) {
$rules[] = (new CustomFieldValidationRule($property['validation'], $data));
}
// For get values instead of Id for select/multi select options
foreach ($selectionFields as $field) {
if (isset($data[$field['id']]) && is_array($data[$field['id']])) {
$data[$field['id']] = array_map(function ($val) use ($field) {
@@ -109,11 +115,6 @@ class AnswerFormRequest extends FormRequest
$rules = array_merge($rules, $this->getPropertyRules($property));
}
// User custom validation
if (!(Str::of($property['type'])->startsWith('nf-')) && isset($property['validation'])) {
$rules[] = (new CustomFieldValidationRule($property['validation'], $data));
}
$this->requestRules[$propertyId] = $rules;
}