Merge branch 'feature-VALIDATION-7_requiredifotherfieldsempty' into r…

…elease-1.3.0
pixl8 · Sep 23, 2024 · 8af3fa1 · 8af3fa1
2 parents 8588b3f + d58217f
commit 8af3fa1
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/services/validation/ValidationExtrasValidators.cfc b/services/validation/ValidationExtrasValidators.cfc
@@ -51,16 +51,16 @@ component {
 		, required struct data
 		, required string otherFields
 		,          any    value = ""
-    ) validatorMessage="cms:validation.conditional.required.default" {
-        for ( var otherField in ListToArray( otherFields ) ) {
-            if ( len( arguments.data[ otherField ] ?: "" ) ) {
-                return true;
-            }
-        }
-        return arguments.data.keyExists( fieldName ) && !IsEmpty( value );
-    }
-
-    public string function requiredIfOtherFieldsEmpty_js() validatorMessage="cms:validation.conditional.required.default" {
+	) validatorMessage="cms:validation.conditional.required.default" {
+		for ( var otherField in ListToArray( otherFields ) ) {
+			if ( len( arguments.data[ otherField ] ?: "" ) ) {
+				return true;
+			}
+		}
+		return arguments.data.keyExists( fieldName ) && !IsEmpty( value );
+	}
+
+	public string function requiredIfOtherFieldsEmpty_js() validatorMessage="cms:validation.conditional.required.default" {
 		return "function( value, el, params ){
 			var otherFields = params[0].split(',');
 			for ( var i=0; i<otherFields.length; i++ ) {
@@ -71,7 +71,7 @@ component {
 			}
 			return ( value.length > 0 );
 		}";
-    }
+	}
 
 	public boolean function requiredIfOtherFieldNotEmpty( required string fieldName, any value="", required struct data, required string otherField ) validatorMessage="cms:validation.conditional.required.default" {
 		if ( !len( arguments.data[ arguments.otherField ] ?: "" ) ) {