diff --git a/src/services/decorators.js b/src/services/decorators.js index eeaaf8d57..a9aa48a16 100644 --- a/src/services/decorators.js +++ b/src/services/decorators.js @@ -138,8 +138,14 @@ angular.module('schemaForm').provider('schemaFormDecorators', if (!scope.ngModel) { return false; } - return scope.ngModel.$valid && - (!scope.ngModel.$pristine || !scope.ngModel.$isEmpty(scope.ngModel.$modelValue)); + if (scope.options && scope.options.pristine && + scope.options.pristine.success === false) { + return scope.ngModel.$valid && + (!scope.ngModel.$pristine && !scope.ngModel.$isEmpty(scope.ngModel.$modelValue)); + } else { + return scope.ngModel.$valid && + (!scope.ngModel.$pristine || !scope.ngModel.$isEmpty(scope.ngModel.$modelValue)); + } }; scope.hasError = function() {