feat(breeze): further development

Fixed the UX where an invalid breeze property validation is overwritten if normal rules are valid.
aurelia · Apr 26, 2015 · 772f332 · 772f332
1 parent 09f090f
commit 772f332
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 5 deletions.
diff --git a/dist/amd/validation/validation-group.js b/dist/amd/validation/validation-group.js
@@ -43,7 +43,8 @@ define(['exports', '../validation/validation-group-builder', '../validation/vali
         this.onPropertyValidate(function (propertyBindingPath) {
           _this2.passes(function () {
             breezeEntity.entityAspect.validateProperty(propertyBindingPath);
-            return true;
+            var errors = breezeEntity.entityAspect.getValidationErrors(propertyBindingPath);
+            if (errors.length === 0) return true;else return errors[0].errorMessage;
           });
         });
         this.onValidate(function () {

diff --git a/dist/commonjs/validation/validation-group.js b/dist/commonjs/validation/validation-group.js
@@ -48,7 +48,8 @@ var ValidationGroup = (function () {
       this.onPropertyValidate(function (propertyBindingPath) {
         _this2.passes(function () {
           breezeEntity.entityAspect.validateProperty(propertyBindingPath);
-          return true;
+          var errors = breezeEntity.entityAspect.getValidationErrors(propertyBindingPath);
+          if (errors.length === 0) return true;else return errors[0].errorMessage;
         });
       });
       this.onValidate(function () {

diff --git a/dist/es6/validation/validation-group.js b/dist/es6/validation/validation-group.js
@@ -39,7 +39,11 @@ export class ValidationGroup {
     this.onPropertyValidate( (propertyBindingPath) => {
       this.passes( () => {
         breezeEntity.entityAspect.validateProperty(propertyBindingPath);
-        return true;
+        var errors = breezeEntity.entityAspect.getValidationErrors(propertyBindingPath);
+        if(errors.length === 0)
+          return true;
+        else
+          return errors[0].errorMessage;
       });
     });
     this.onValidate( () => {

diff --git a/dist/system/validation/validation-group.js b/dist/system/validation/validation-group.js
@@ -50,7 +50,8 @@ System.register(['../validation/validation-group-builder', '../validation/valida
             this.onPropertyValidate(function (propertyBindingPath) {
               _this2.passes(function () {
                 breezeEntity.entityAspect.validateProperty(propertyBindingPath);
-                return true;
+                var errors = breezeEntity.entityAspect.getValidationErrors(propertyBindingPath);
+                if (errors.length === 0) return true;else return errors[0].errorMessage;
               });
             });
             this.onValidate(function () {

diff --git a/src/validation/validation-group.js b/src/validation/validation-group.js
@@ -39,7 +39,11 @@ export class ValidationGroup {
     this.onPropertyValidate( (propertyBindingPath) => {
       this.passes( () => {
         breezeEntity.entityAspect.validateProperty(propertyBindingPath);
-        return true;
+        var errors = breezeEntity.entityAspect.getValidationErrors(propertyBindingPath);
+        if(errors.length === 0)
+          return true;
+        else
+          return errors[0].errorMessage;
       });
     });
     this.onValidate( () => {