fix: Fix condition for SingleSelectConstraint

kumy · kumy · commit 6e2845b0cd2e · 2024-09-22T14:03:33.000+02:00
diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/Constraints/SingleSelectConstraint.php b/src/opnsense/mvc/app/models/OPNsense/Base/Constraints/SingleSelectConstraint.php
@@ -53,7 +53,7 @@ public function validate($validator, $attribute): bool
             $Fields = array_unique(array_merge(array($nodeName), $this->getOptionValueList('addFields')));
             $countNotEmpty = 0;
             foreach ($Fields as $fieldname) {
-                if (!is_null($parentNode->$fieldname) || !$parentNode->$fieldname->isEmpty()) {
+                if (!is_null($parentNode->$fieldname) && !$parentNode->$fieldname->isEmpty()) {
                     $countNotEmpty++;
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public function validate($validator, $attribute): bool`
`53`	`53`	`$Fields = array_unique(array_merge(array($nodeName), $this->getOptionValueList('addFields')));`
`54`	`54`	`$countNotEmpty = 0;`
`55`	`55`	`foreach ($Fields as $fieldname) {`
`56`		`- if (!is_null($parentNode->$fieldname) \|\| !$parentNode->$fieldname->isEmpty()) {`
	`56`	`+ if (!is_null($parentNode->$fieldname) && !$parentNode->$fieldname->isEmpty()) {`
`57`	`57`	`$countNotEmpty++;`
`58`	`58`	`}`
`59`	`59`	`}`