Skip to content

UDFValidator added rejectedValue to newError arguments #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lmajano merged 8 commits into from
Mar 5, 2019
Merged

UDFValidator added rejectedValue to newError arguments #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
dc5ca66
version bump
lmajano Dec 1, 2017
3b48b07
Add missing comma
elpete Dec 20, 2017
0c259c1
Switch evaluate for invoke
elpete Mar 19, 2018
23eac9f
Add missing comma
elpete Mar 19, 2018
e9b4f27
Merge pull request #27 from coldbox-modules/elpete-patch-1
lmajano Mar 20, 2018
7f15cb6
Added rejectedValue to error object
angel-chrystian Jan 14, 2019
7da6337
Merge branch 'development' into master
angel-chrystian Jan 14, 2019
1122258
Fix in UDFValidator.validate args
angel-chrystian Jan 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .module.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
project.name=cbvalidation
project.version=1.3.1
project.version=1.4.0
module.name=cbvalidation
4 changes: 2 additions & 2 deletions modules/cbvalidation/models/Mixins.cfm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ function validateModel(
string fields="*",
any constraints,
string locale="",
string excludeFields=""
string excludeFields="",
string includeFields=""
){
return getValidationManager().validate( argumentCollection=arguments );
Expand All @@ -29,4 +29,4 @@ function getValidationManager(){
return wirebox.getInstance( "ValidationManager@cbvalidation" );
}

</cfscript>
</cfscript>
12 changes: 6 additions & 6 deletions modules/cbvalidation/models/ValidationManager.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,11 +172,11 @@ component accessors="true" serialize="false" implements="IValidationManager" sin
// had to use nasty evaluate until adobe cf get's their act together on invoke.
getValidator( validatorType=key, validationData=arguments.rules[ key ] )
.validate(
validationResult = results,
target = arguments.target,
field = arguments.field,
targetValue = evaluate( "arguments.target.get#arguments.field#()" ),
validationData = arguments.rules[ key ]
validationResult = results,
target = arguments.target,
field = arguments.field,
targetValue = invoke( arguments.target, "get" & arguments.field ),
validationData = arguments.rules[ key ]
);

}
Expand Down Expand Up @@ -311,4 +311,4 @@ component accessors="true" serialize="false" implements="IValidationManager" sin
return {};
}

}
}
2 changes: 1 addition & 1 deletion modules/cbvalidation/models/validators/UDFValidator.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ component accessors="true" implements="cbvalidation.models.validators.IValidator
return true;
}

var args = {message="The '#arguments.field#' value does not validate",field=arguments.field,validationType=getName(),validationData=arguments.validationData};
var args = {message="The '#arguments.field#' value does not validate",field=arguments.field,validationType=getName(),rejectedValue=( isSimpleValue( arguments.targetValue ) ? arguments.targetValue : '' ),validationData=arguments.validationData};
validationResult.addError( validationResult.newError(argumentCollection=args) );
return false;
}
Expand Down