External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-19 14:57:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

Ensure parsers always return a value

Browse Source
This commit is contained in:
Joe Fiorini
2015-07-29 15:49:45 -04:00
parent bf8b55bfb5
commit a037063a22
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
awx/ui/client/src/shared/directives.js
View File

@@ -32,7 +32,7 @@ angular.module('AWDirectives', ['RestServices', 'Utilities', 'AuthService', 'Job
} }
// Invalid, return undefined (no model update) // Invalid, return undefined (no model update)
ctrl.$setValidity('awpassmatch', false); ctrl.$setValidity('awpassmatch', false);
return undefined; return viewValue;
}); });
} }
}; };
@@ -147,13 +147,15 @@ angular.module('AWDirectives', ['RestServices', 'Utilities', 'AuthService', 'Job
ctrl.$setValidity('reqCheck', false); ctrl.$setValidity('reqCheck', false);
} }
ctrl.$parsers.unshift(function(){ ctrl.$parsers.unshift(function(viewValue){
for (var c in scope.cbModel) { for (var c in scope.cbModel) {
if (scope.cbModel[c]) { if (scope.cbModel[c]) {
ctrl.$setValidity('checkbox', true); ctrl.$setValidity('checkbox', true);
} }
} }
ctrl.$setValidity('checkbox', false); ctrl.$setValidity('checkbox', false);
return viewValue;
}); });
scope.update = function(){ scope.update = function(){
@@ -421,6 +423,7 @@ angular.module('AWDirectives', ['RestServices', 'Utilities', 'AuthService', 'Job
ctrl.$setValidity('awlookup', true); ctrl.$setValidity('awlookup', true);
scope[elm.attr('data-source')] = null; scope[elm.attr('data-source')] = null;
} }
return viewValue;
}); });
} }
}; };
@@ -444,6 +447,8 @@ angular.module('AWDirectives', ['RestServices', 'Utilities', 'AuthService', 'Job
} }
} }
ctrl.$setValidity('awvalidurl', validity); ctrl.$setValidity('awvalidurl', validity);
return viewValue;
}); });
} }
}; };