Skip to content

Beautiful Open-Source Form Builder

Fix cleared custom validation

Julien Nahum7b97705c5bce
diff --git a/app/Rules/CustomFieldValidationRule.php b/app/Rules/CustomFieldValidationRule.php
index 5f6727861..21082155b 100644
--- a/app/Rules/CustomFieldValidationRule.php
+++ b/app/Rules/CustomFieldValidationRule.php
@@ -33,11 +33,11 @@ class CustomFieldValidationRule implements ValidationRule
*/
public function passes($attribute, $value)
{
- if (!($this->validation['error_conditions']['conditions'] ?? null) || is_null(
- $this->validation['error_conditions']['conditions'] ?? null
- )) {
+ $logicConditions = $this->validation['error_conditions']['conditions'] ?? null;
+ if (empty($logicConditions) || empty($logicConditions['children'] ?? [])) {
return true;
}
+
return FormLogicConditionChecker::conditionsMet(
$this->validation['error_conditions']['conditions'],
$this->formData