External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-04-09 20:19:21 -02:30
Code Issues Packages Projects Releases Wiki Activity

Survey maker/taker issue with int/floats = 0

Browse Source 
fixed a defect with the survey maker/taker where floats/ints equal to zero weren't being displayed the entire way through
This commit is contained in:
Jared Tabor
2014-12-15 13:23:33 -05:00
parent d2a4f2a190
commit e5ba0ce8bc
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,7 +38,7 @@ angular.module('JobSubmissionHelper', [ 'RestServices', 'Utilities', 'Credential
} }
if(scope.survey_enabled===true){ if(scope.survey_enabled===true){
for (fld in scope.job_launch_form){ for (fld in scope.job_launch_form){
if(scope[fld]){ if(scope[fld] || scope[fld] === 0){
job_launch_data[fld] = scope[fld]; job_launch_data[fld] = scope[fld];
} }
} }
@@ -462,8 +462,12 @@ function($location, Wait, GetBasePath, LookUpInit, JobTemplateForm, CredentialLi
html += '<div class="survey_taker_description"><i>'+question.question_description+'</i></div>\n'; html += '<div class="survey_taker_description"><i>'+question.question_description+'</i></div>\n';
} }
question.default = (question.default) ? question.default.replace(/</g, "&lt;") : undefined; // if(question.default && question.default.indexOf('<') !== -1){
question.default = (question.default) ? question.default.replace(/>/g, "&gt;") : undefined; // question.default = (question.default) ? question.default.replace(/</g, "&lt;") : undefined;
// }
// if (question.default && question.default.indexOf('>') !== -1){
// question.default = (question.default) ? question.default.replace(/>/g, "&gt;") : undefined;
// }
scope[question.variable] = question.default; scope[question.variable] = question.default;
if(question.type === 'text' ){ if(question.type === 'text' ){