External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-10 05:59:28 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6730 from mabashian/6663-multiselect-dropdown

Browse Source 
Fixed multi-select survey questions on launch
This commit is contained in:
Michael Abashian
2017-06-27 10:09:30 -04:00
committed by GitHub
parent e107bc6cc9 098e369e71
commit 78ba96b541
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/client/src/templates/survey-maker/render/multiple-choice.directive.js
View File

@@ -17,8 +17,8 @@ function link($timeout, CreateSelect2, scope, element, attrs, ngModel) {
element: element.find('select'), element: element.find('select'),
multiple: scope.isMultipleSelect(), multiple: scope.isMultipleSelect(),
minimumResultsForSearch: scope.isMultipleSelect() ? Infinity : 10, minimumResultsForSearch: scope.isMultipleSelect() ? Infinity : 10,
customDropdownAdapter: scope.preview ? false : true, customDropdownAdapter: true,
disabledOptions: true disabledOptions: scope.preview ? true : false
}); });
}); });

3
awx/ui/client/src/templates/survey-maker/render/survey-question.partial.html
View File

@@ -10,7 +10,8 @@
question="question" question="question"
choices="choices" choices="choices"
ng-required="isRequired === 'true'" ng-required="isRequired === 'true'"
ng-model="defaultValue"> ng-model="defaultValue"
preview="preview">
</multiple-choice> </multiple-choice>
</div> </div>
<div ng-if="question.type === 'password'" class="input_area input-group"> <div ng-if="question.type === 'password'" class="input_area input-group">