External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-07 19:51:08 -03:30
Code Issues Packages Projects Releases Wiki Activity

Job submission for optional survey questions

Browse Source 
Make sure optional multiselect and multiplechoice answers are ignored if not answered
This commit is contained in:
Jared Tabor
2015-02-19 12:59:09 -05:00
parent 0286800ead
commit db8eed2ae5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/static/js/helpers/JobSubmission.js
View File

@@ -77,7 +77,7 @@ angular.module('JobSubmissionHelper', [ 'RestServices', 'Utilities', 'Credential
for (var i=0; i < scope.survey_questions.length; i++){ for (var i=0; i < scope.survey_questions.length; i++){
var fld = scope.survey_questions[i].variable; var fld = scope.survey_questions[i].variable;
// grab all survey questions that have answers // grab all survey questions that have answers
if(scope[fld]) { if(scope.survey_questions[i].required || (scope.survey_questions[i].required === false && scope[fld].toString()!=="")) {
job_launch_data.extra_vars[fld] = scope[fld]; job_launch_data.extra_vars[fld] = scope[fld];
} }
// for optional text and text-areas, submit a blank string if min length is 0 // for optional text and text-areas, submit a blank string if min length is 0
@@ -544,7 +544,7 @@ angular.module('JobSubmissionHelper', [ 'RestServices', 'Utilities', 'Credential
} }
if(question.type === "textarea"){ if(question.type === "textarea"){
scope[question.variable] = question.default || question.default_textarea; scope[question.variable] = (question.default_textarea) ? question.default_textarea : (question.default) ? question.default : "";
minlength = (!Empty(question.min)) ? Number(question.min) : ""; minlength = (!Empty(question.min)) ? Number(question.min) : "";
maxlength =(!Empty(question.max)) ? Number(question.max) : "" ; maxlength =(!Empty(question.max)) ? Number(question.max) : "" ;
html+='<textarea id="'+question.variable+'" name="'+question.variable+'" ng-model="'+question.variable+'" '+ html+='<textarea id="'+question.variable+'" name="'+question.variable+'" ng-model="'+question.variable+'" '+