Skip to content

Commit 30d581a

Browse files
authored
Merge pull request #34 from coldbox-modules/elpete-patch-2
Ignore null values to inList validator
2 parents d5e86f7 + cfe69ac commit 30d581a

File tree

1 file changed

+16
-4
lines changed

1 file changed

+16
-4
lines changed

models/validators/InListValidator.cfc

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,25 @@ component accessors="true" implements="cbvalidation.models.validators.IValidator
2323
* @validationDataThe validation data the validator was created with
2424
*/
2525
boolean function validate(required cbvalidation.models.result.IValidationResult validationResult, required any target, required string field, any targetValue, any validationData){
26+
if ( isNull( arguments.targetValue ) ) {
27+
return true;
28+
}
2629

27-
if( !isNull(arguments.targetValue) AND listFindNoCase(arguments.validationData, arguments.targetValue)){
30+
if ( listFindNoCase( arguments.validationData, arguments.targetValue ) ) {
2831
return true;
2932
}
3033

31-
var args = {message="The '#arguments.field#' value is not in the constraint list: #arguments.validationData#",field=arguments.field,validationType=getName(),validationData=arguments.validationData};
32-
var error = validationResult.newError(argumentCollection=args).setErrorMetadata({inlist=arguments.validationData});
34+
var args = {
35+
"message" = "The '#arguments.field#' value is not in the constraint list: #arguments.validationData#",
36+
"field" = arguments.field,
37+
"validationType" = getName(),
38+
"validationData" = arguments.validationData
39+
};
40+
var error = validationResult
41+
.newError( argumentCollection = args )
42+
.setErrorMetadata( {
43+
"inlist" = arguments.validationData
44+
} );
3345
validationResult.addError( error );
3446
return false;
3547
}
@@ -41,4 +53,4 @@ component accessors="true" implements="cbvalidation.models.validators.IValidator
4153
return name;
4254
}
4355

44-
}
56+
}

0 commit comments

Comments
 (0)