=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.validations.js' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.validations.js 2015-06-15 11:04:20 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.validations.js 2015-07-14 18:31:13 +0000 @@ -7,27 +7,32 @@ function setValidity(numberType, isRequired){ if(numberType === 'number'){ - ngModel.$validators.number = function(value) { + ngModel.$validators.number = function(value) { + value = value === 0 ? value.toString(): value; return value === 'null' || !value ? !isRequired : dhis2.validation.isNumber(value); }; } else if(numberType === 'posInt'){ - ngModel.$validators.posInt = function(value) { + ngModel.$validators.posInt = function(value) { + value = value === 0 ? value.toString(): value; return value === 'null' || !value ? !isRequired : dhis2.validation.isPositiveInt(value); }; } else if(numberType === 'negInt'){ ngModel.$validators.negInt = function(value) { + value = value === 0 ? value.toString(): value; return value === 'null' || !value ? !isRequired : dhis2.validation.isNegativeInt(value); }; } else if(numberType === 'zeroPositiveInt'){ - ngModel.$validators.zeroPositiveInt = function(value) { + ngModel.$validators.zeroPositiveInt = function(value) { + value = value === 0 ? value.toString(): value; return value === 'null' || !value ? !isRequired : dhis2.validation.isZeroOrPositiveInt(value); }; } else if(numberType === 'int'){ ngModel.$validators.int = function(value) { + value = value === 0 ? value.toString(): value; return value === 'null' || !value ? !isRequired : dhis2.validation.isInt(value); }; }