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

Merge pull request #2595 from mabashian/765-split

Browse Source 
Adds extra logic to handle survey question choices in array form
This commit is contained in:
Michael Abashian 2018-07-19 16:14:44 -04:00 committed by GitHub
commit 98f86c418e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/client/src/templates/prompt/prompt.service.js
View File

@ -70,7 +70,7 @@ function PromptService (Empty, $filter) {
} else {
question.model = question.default.split(/\n/);
}
question.choices = question.choices.split(/\n/);
question.choices = typeof question.choices.split === 'function' ? question.choices.split(/\n/) : question.choices;
}
else if(question.type === "multiplechoice") {
if(params.extra_data && params.extra_data[question.variable]) {
@ -80,7 +80,7 @@ function PromptService (Empty, $filter) {
question.model = question.default ? angular.copy(question.default) : "";
}
question.choices = question.choices.split(/\n/);
question.choices = typeof question.choices.split === 'function' ? question.choices.split(/\n/) : question.choices;
// Add a default empty string option to the choices array. If this choice is
// selected then the extra var will not be sent when we POST to the launch

2
awx/ui/client/src/templates/survey-maker/render/survey-question.directive.js
View File

@ -99,7 +99,7 @@ function link($sce, $filter, Empty, scope, element, attrs) {
// Split out choices to be consumed by the multiple-choice directive
if (!_.isUndefined(scope.question.choices)) {
scope.choices = scope.question.choices.split('\n');
scope.choices = typeof scope.question.choices.split === 'function' ? scope.question.choices.split('\n') : scope.question.choices;
}
sanitizeDefault();