From 098e369e716f655c028757317bf8097fef6cbb20 Mon Sep 17 00:00:00 2001 From: Michael Abashian Date: Mon, 26 Jun 2017 12:25:20 -0400 Subject: [PATCH] Fixed multi-select survey questions on launch --- .../survey-maker/render/multiple-choice.directive.js | 4 ++-- .../survey-maker/render/survey-question.partial.html | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/awx/ui/client/src/templates/survey-maker/render/multiple-choice.directive.js b/awx/ui/client/src/templates/survey-maker/render/multiple-choice.directive.js index d22c548b84..2f782c84a6 100644 --- a/awx/ui/client/src/templates/survey-maker/render/multiple-choice.directive.js +++ b/awx/ui/client/src/templates/survey-maker/render/multiple-choice.directive.js @@ -17,8 +17,8 @@ function link($timeout, CreateSelect2, scope, element, attrs, ngModel) { element: element.find('select'), multiple: scope.isMultipleSelect(), minimumResultsForSearch: scope.isMultipleSelect() ? Infinity : 10, - customDropdownAdapter: scope.preview ? false : true, - disabledOptions: true + customDropdownAdapter: true, + disabledOptions: scope.preview ? true : false }); }); diff --git a/awx/ui/client/src/templates/survey-maker/render/survey-question.partial.html b/awx/ui/client/src/templates/survey-maker/render/survey-question.partial.html index 3e6a7bdceb..e65de99f19 100644 --- a/awx/ui/client/src/templates/survey-maker/render/survey-question.partial.html +++ b/awx/ui/client/src/templates/survey-maker/render/survey-question.partial.html @@ -10,7 +10,8 @@ question="question" choices="choices" ng-required="isRequired === 'true'" - ng-model="defaultValue"> + ng-model="defaultValue" + preview="preview">