CBX-397 - Fix model validation on tranlatable field

jpboudreault · Apr 23, 2014 · bc3f65d · bc3f65d
1 parent 1745f12
commit bc3f65d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/angular-activerecord.js b/angular-activerecord.js
@@ -332,12 +332,12 @@ angular.module('ActiveRecord', []).factory('ActiveRecord', ['$http', '$q', '$par
 										if (typeof sprintf !== "undefined") {
 											errorMessage = sprintf(errorMessage, {fieldName: mthis.$fieldTranslations[fieldName] || fieldName, fieldValue: prop, validationValue: value});
 										}
-									} else {
+									} else if (functionName === "notEmpty") {
 										keepGoing = false;
 									}
 								}
 							});
-							if (keepGoing) errors.push(errorMessage);
+							if (keepGoing && errorMessage) errors.push(errorMessage);
 						}
 					});
 				} else if (this.$validations[fieldName].required) {