diff --git a/awx/ui/client/src/shared/Utilities.js b/awx/ui/client/src/shared/Utilities.js index 531bbc357c..c1b43c73bf 100644 --- a/awx/ui/client/src/shared/Utilities.js +++ b/awx/ui/client/src/shared/Utilities.js @@ -640,10 +640,6 @@ angular.module('Utilities', ['RestServices', 'Utilities']) // Don't toggle the dropdown when a multiselect option is // being removed if (multiple) { - if (params.disabledOptions) { - $(element).on('select2:selecting', e => e.preventDefault()); - } - $(element).on('select2:opening', (e) => { var unselecting = $(e.target).data('select2-unselecting'); if (unselecting === true) { 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 2f782c84a6..9eccb7c195 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,7 @@ function link($timeout, CreateSelect2, scope, element, attrs, ngModel) { element: element.find('select'), multiple: scope.isMultipleSelect(), minimumResultsForSearch: scope.isMultipleSelect() ? Infinity : 10, - customDropdownAdapter: true, - disabledOptions: scope.preview ? true : false + customDropdownAdapter: scope.preview ? false : true }); }); 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 fe42936d0e..0be50a89b2 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 @@ -11,6 +11,7 @@ choices="choices" ng-required="isRequired === 'true'" ng-model="defaultValue" + ng-disabled="isDisabled === 'true'" preview="preview">