Merge pull request #1 from wpdebruin/wpdebruin-BOX-63

wpdebruin · web-flow · commit 9db1ce2c78f7 · 2020-05-04T21:29:16.000+02:00
fix for BOX-63 and BOX-68
diff --git a/models/result/ValidationResult.cfc b/models/result/ValidationResult.cfc
@@ -163,7 +163,7 @@ component accessors="true" {
 		// The validation type
 		arguments.message = replacenocase( arguments.message, "{validationType}", arguments.error.getValidationType(), "all");
 		// The validation data
-		if( arguments.error.getValidationType() neq 'UDF' ){
+		if( !listfindnocase( "UDF,RequiredUnless,RequiredIf,Unique", arguments.error.getValidationType() )){
 		 	arguments.message = replacenocase( arguments.message, "{validationData}", arguments.error.getValidationData(), "all");
 		}
 		// The target name of the object
@@ -291,4 +291,4 @@ component accessors="true" {
 		return this;
 	}
 
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ component accessors="true" {`
`163`	`163`	`// The validation type`
`164`	`164`	`arguments.message = replacenocase( arguments.message, "{validationType}", arguments.error.getValidationType(), "all");`
`165`	`165`	`// The validation data`
`166`		`- if( arguments.error.getValidationType() neq 'UDF' ){`
	`166`	`+ if( !listfindnocase( "UDF,RequiredUnless,RequiredIf,Unique", arguments.error.getValidationType() )){`
`167`	`167`	`arguments.message = replacenocase( arguments.message, "{validationData}", arguments.error.getValidationData(), "all");`
`168`	`168`	`}`
`169`	`169`	`// The target name of the object`
`@@ -291,4 +291,4 @@ component accessors="true" {`
`291`	`291`	`return this;`
`292`	`292`	`}`
`293`	`293`
`294`		`-}`
	`294`	`+}`