Skip to content

Commit cfdd912

Browse files
elpeteelpete
authored
Merge pull request #33 from wpdebruin/development
CCM-57
2 parents 30d581a + 8cab0a2 commit cfdd912

12 files changed

+86
-22
lines changed

‎models/validators/DiscreteValidator.cfc‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,13 @@ component accessors="true" implements="cbvalidation.models.validators.IValidator
5050
}
5151

5252
if( !r ){
53-
var args = {message="The '#arguments.field#' value is #operation# than #operationValue#",field=arguments.field,validationType=getName(),validationData=arguments.validationData};
53+
var args = {
54+
message = "The '#arguments.field#' value is #operation# than #operationValue#",
55+
field = arguments.field,
56+
validationType = getName(),
57+
rejectedValue = ( isSimpleValue( arguments.targetValue ) ? arguments.targetValue : '' ),
58+
validationData = arguments.validationData
59+
};
5460
var error = validationResult.newError(argumentCollection=args).setErrorMetadata({operation=operation, operationValue=operationValue});
5561
validationResult.addError( error );
5662
}

‎models/validators/InListValidator.cfc‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,21 @@ component accessors="true" implements="cbvalidation.models.validators.IValidator
3131
return true;
3232
}
3333

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
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+
rejectedValue = ( isSimpleValue( arguments.targetValue ) ? arguments.targetValue : '' ),
39+
validationData = arguments.validationData
3940
};
41+
4042
var error = validationResult
4143
.newError( argumentCollection = args )
4244
.setErrorMetadata( {
4345
"inlist" = arguments.validationData
4446
} );
45-
validationResult.addError( error );
47+
48+
validationResult.addError( error );
4649
return false;
4750
}
4851

‎models/validators/MaxValidator.cfc‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,13 @@ component accessors="true" implements="cbvalidation.models.validators.IValidator
2828
if( !isNull(arguments.targetValue) AND arguments.targetValue <= arguments.validationData ){
2929
return true;
3030
}
31-
32-
var args = {message="The '#arguments.field#' value is not less than or equal to #arguments.validationData#",field=arguments.field,validationType=getName(),validationData=arguments.validationData};
31+
var args = {
32+
message = "The '#arguments.field#' value is not less than or equal to #arguments.validationData#",
33+
field = arguments.field,
34+
validationType = getName(),
35+
rejectedValue = ( isSimpleValue( arguments.targetValue ) ? arguments.targetValue : '' ),
36+
validationData = arguments.validationData
37+
};
3338
var error = validationResult.newError(argumentCollection=args).setErrorMetadata({max=arguments.validationData});
3439
validationResult.addError( error );
3540
return false;

‎models/validators/MethodValidator.cfc‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,14 @@ component accessors="true" implements="cbvalidation.models.validators.IValidator
3535
if( evaluate("arguments.target.#arguments.validationData#( arguments.targetValue )") ){
3636
return true;
3737
}
38+
var args = {
39+
message = "The '#arguments.field#' value does not validate",
40+
field = arguments.field,
41+
validationType = getName(),
42+
rejectedValue = ( isSimpleValue( arguments.targetValue ) ? arguments.targetValue : '' ),
43+
validationData = arguments.validationData
44+
};
3845

39-
var args = {message="The '#arguments.field#' value does validate",field=arguments.field,validationType=getName(),validationData=arguments.validationData};
4046
validationResult.addError( validationResult.newError(argumentCollection=args) );
4147
return false;
4248
}

‎models/validators/MinValidator.cfc‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,13 @@ component accessors="true" implements="cbvalidation.models.validators.IValidator
2929
return true;
3030
}
3131

32-
var args = {message="The '#arguments.field#' value is not greater than or equal to #arguments.validationData#",field=arguments.field,validationType=getName(),validationData=arguments.validationData};
32+
var args = {
33+
message = "The '#arguments.field#' value is not greater than or equal to #arguments.validationData#",
34+
field = arguments.field,
35+
validationType = getName(),
36+
rejectedValue = ( isSimpleValue( arguments.targetValue ) ? arguments.targetValue : '' ),
37+
validationData = arguments.validationData
38+
};
3339
var error = validationResult.newError(argumentCollection=args).setErrorMetadata({min=arguments.validationData});
3440
validationResult.addError( error );
3541
return false;

‎models/validators/RangeValidator.cfc‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,13 @@ component accessors="true" implements="cbvalidation.models.validators.IValidator
3838
if( !isNull(arguments.targetValue) AND targetValue >= min AND ( !len(max) OR targetValue <= max ) ) {
3939
return true;
4040
}
41-
42-
var args = {message="The '#arguments.field#' value is not the value field range (#arguments.validationData#)",field=arguments.field,validationType=getName(),validationData=arguments.validationData};
41+
var args = {
42+
message = "The '#arguments.field#' value is not the value field range (#arguments.validationData#)",
43+
field = arguments.field,
44+
validationType = getName(),
45+
rejectedValue = ( isSimpleValue( arguments.targetValue ) ? arguments.targetValue : '' ),
46+
validationData = arguments.validationData
47+
};
4348
var error = validationResult.newError(argumentCollection=args).setErrorMetadata({range=arguments.validationData,min=min,max=max});
4449
validationResult.addError( error );
4550
return false;

‎models/validators/RegexValidator.cfc‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,13 @@ component accessors="true" implements="cbvalidation.models.validators.IValidator
2929
return true;
3030
}
3131

32-
var args = {message="The '#arguments.field#' value does not match the regular expression: #arguments.validationData#",field=arguments.field,validationType=getName(),validationData=arguments.validationData};
32+
var args = {
33+
message = "The '#arguments.field#' value does not match the regular expression: #arguments.validationData#",
34+
field = arguments.field,
35+
validationType = getName(),
36+
rejectedValue = ( isSimpleValue( arguments.targetValue ) ? arguments.targetValue : '' ),
37+
validationData = arguments.validationData
38+
};
3339
var error = validationResult.newError(argumentCollection=args).setErrorMetadata({regex=arguments.validationData});
3440
validationResult.addError( error );
3541
return false;

‎models/validators/RequiredValidator.cfc‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,14 @@ component accessors="true" implements="cbvalidation.models.validators.IValidator
5757
if( isObject( arguments.targetValue ) ){
5858
return true;
5959
}
60+
var args = {
61+
message = "The '#arguments.field#' value is required",
62+
field = arguments.field,
63+
validationType = getName(),
64+
rejectedValue = ( isSimpleValue( arguments.targetValue ) ? arguments.targetValue : '' ),
65+
validationData = arguments.validationData
66+
};
6067

61-
var args = {message="The '#arguments.field#' value is required",field=arguments.field,validationType=getName(),validationData=arguments.validationData};
6268
validationResult.addError( validationResult.newError(argumentCollection=args) );
6369
return false;
6470
}

‎models/validators/SameAsNoCaseValidator.cfc‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,13 @@ component accessors="true" implements="cbvalidation.models.validators.IValidator
3030
if( !isNull(arguments.targetValue) AND compareNoCase(arguments.targetValue, compareValue) EQ 0 ){
3131
return true;
3232
}
33-
34-
var args = {message="The '#arguments.field#' value is not the same as #compareValue.toString()#",field=arguments.field,validationType=getName(),validationData=arguments.validationData};
33+
var args = {
34+
message = "The '#arguments.field#' value is not the same as #compareValue.toString()#",
35+
field = arguments.field,
36+
validationType = getName(),
37+
rejectedValue = ( isSimpleValue( arguments.targetValue ) ? arguments.targetValue : '' ),
38+
validationData = arguments.validationData
39+
};
3540
var error = validationResult.newError(argumentCollection=args).setErrorMetadata({sameas=arguments.validationData});
3641
validationResult.addError( error );
3742
return false;

‎models/validators/SameAsValidator.cfc‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,13 @@ component accessors="true" implements="cbvalidation.models.validators.IValidator
3030
if( !isNull(arguments.targetValue) AND compare(arguments.targetValue, compareValue) EQ 0 ){
3131
return true;
3232
}
33-
34-
var args = {message="The '#arguments.field#' value is not the same as #compareValue.toString()#",field=arguments.field,validationType=getName(),validationData=arguments.validationData};
33+
var args = {
34+
message = "The '#arguments.field#' value is not the same as #compareValue.toString()#",
35+
field = arguments.field,
36+
validationType = getName(),
37+
rejectedValue = ( isSimpleValue( arguments.targetValue ) ? arguments.targetValue : '' ),
38+
validationData = arguments.validationData
39+
};
3540
var error = validationResult.newError(argumentCollection=args).setErrorMetadata({sameas=arguments.validationData});
3641
validationResult.addError( error );
3742
return false;

0 commit comments

Comments
 (0)