From 7b97705c5bce3c3e587c121226da286cd831d148 Mon Sep 17 00:00:00 2001 From: Julien Nahum Date: Mon, 17 Jun 2024 14:56:36 +0200 Subject: [PATCH] Fix cleared custom validation --- app/Rules/CustomFieldValidationRule.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Rules/CustomFieldValidationRule.php b/app/Rules/CustomFieldValidationRule.php index 5f672786..21082155 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