Skip to content

Commit 6826656

Browse files
committed
Merge branch 'development'
2 parents a533b41 + 315a882 commit 6826656

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

box.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name":"ColdBox Validation",
33
"author":"Ortus Solutions <[email protected]>",
4-
"version":"1.5.0",
4+
"version":"1.5.1",
55
"location":"https://downloads.ortussolutions.com/ortussolutions/coldbox-modules/cbvalidation/@build.version@/[email protected]@.zip",
66
"slug":"cbvalidation",
77
"type":"modules",

changelog.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# CHANGELOG
22

3+
## 1.5.1
4+
5+
* `bug` : This version's mixin is causing errors because its looking for this.validate() and its looking in the handler, not in the mixin file itself.
6+
37
## 1.5.0
48

59
* `features` : `validateOrFail()` new method to validate and if it fails it will throw a `ValidationException`. Also if the target is an object, the object is returned. If the target is a struct, the struct is returned ONLY with the validated fields.

models/Mixins.cfm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ function validateModel(
5454
string excludeFields="",
5555
string includeFields=""
5656
){
57-
return this.validate( argumentCollection=arguments );
57+
return getValidationManager().validate( argumentCollection=arguments );
5858
}
5959
6060
</cfscript>

0 commit comments

Comments
 (0)