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

Merge pull request #2838 from jaredevantabor/fix-765

Browse Source 
Checking for undefined default survey answers
This commit is contained in:
Jared Tabor
2018-08-16 09:20:42 -07:00
committed by GitHub
parent e87633f1d8 950e4dab04
commit 5b93007ba1
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -261,7 +261,7 @@ export default
scope.maxTextError = false;
if(scope.type.type==="text"){
if(scope.default.trim() !== ""){
if(scope.default && scope.default.trim() !== ""){
if(scope.default.trim().length < scope.text_min && scope.text_min !== "" ){
scope.minTextError = true;
}
@@ -272,7 +272,7 @@ export default
}
if(scope.type.type==="textarea"){
if(scope.default_textarea.trim() !== ""){
if(scope.default_textarea && scope.default_textarea.trim() !== ""){
if(scope.default_textarea.trim().length < scope.textarea_min && scope.textarea_min !== "" ){
scope.minTextError = true;
}
@@ -283,7 +283,7 @@ export default
}
if(scope.type.type==="password"){
if(scope.default_password.trim() !== ""){
if(scope.default_password && scope.default_password.trim() !== ""){
if(scope.default_password.trim().length < scope.password_min && scope.password_min !== "" ){
scope.minTextError = true;
}
@@ -293,7 +293,7 @@ export default
}
}
if(scope.type.type==="multiselect" && scope.default_multiselect.trim() !== ""){
if(scope.type.type==="multiselect" && scope.default_multiselect && scope.default_multiselect.trim() !== ""){
choiceArray = scope.choices.split(/\n/);
answerArray = scope.default_multiselect.split(/\n/);
@@ -306,7 +306,7 @@ export default
}
}
if(scope.type.type==="multiplechoice" && scope.default.trim() !== ""){
if(scope.type.type==="multiplechoice" && scope.default && scope.default.trim() !== ""){
choiceArray = scope.choices.split(/\n/);
if($.inArray(scope.default, choiceArray)===-1){
scope.invalidChoice = true;