External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-11 01:57:35 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4509 from saito-hideki/issue/tower/3679

Browse Source 
Fixed form validation to JT survey minimum & maximum values

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot] 2019-08-19 14:31:59 +00:00 committed by GitHub
commit 2cdd007ed0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
awx/ui/client/src/templates/survey-maker/surveys/init.factory.js
View File

@ -262,33 +262,45 @@ export default
if(scope.type.type==="text"){
if(scope.default && scope.default.trim() !== ""){
if(scope.default.trim().length < scope.text_min && scope.text_min !== "" ){
scope.minTextError = true;
if(scope.default.trim().length < scope.text_min &&
scope.text_min !== "" &&
scope.text_min !== null ){
scope.minTextError = true;
}
if(scope.text_max < scope.default.trim().length && scope.text_max !== "" ){
scope.maxTextError = true;
if(scope.text_max < scope.default.trim().length &&
scope.text_max !== "" &&
scope.text_max !== null ){
scope.maxTextError = true;
}
}
}
if(scope.type.type==="textarea"){
if(scope.default_textarea && scope.default_textarea.trim() !== ""){
if(scope.default_textarea.trim().length < scope.textarea_min && scope.textarea_min !== "" ){
scope.minTextError = true;
if(scope.default_textarea.trim().length < scope.textarea_min &&
scope.textarea_min !== "" &&
scope.textarea_min !== null ){
scope.minTextError = true;
}
if(scope.textarea_max < scope.default_textarea.trim().length && scope.textarea_max !== "" ){
scope.maxTextError = true;
if(scope.textarea_max < scope.default_textarea.trim().length &&
scope.textarea_max !== "" &&
scope.textarea_max !== null ){
scope.maxTextError = true;
}
}
}
if(scope.type.type==="password"){
if(scope.default_password && scope.default_password.trim() !== ""){
if(scope.default_password.trim().length < scope.password_min && scope.password_min !== "" ){
scope.minTextError = true;
if(scope.default_password.trim().length < scope.password_min &&
scope.password_min !== "" &&
scope.password_min !== null ){
scope.minTextError = true;
}
if(scope.password_max < scope.default_password.trim().length && scope.password_max !== "" ){
scope.maxTextError = true;
if(scope.password_max < scope.default_password.trim().length &&
scope.password_max !== "" &&
scope.password_max !== null ){
scope.maxTextError = true;
}
}
}