External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-24 22:46:01 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #309 from mabashian/roll-back-survey-question-changes

Browse Source 
Rolled back survey question preview enhancements
This commit is contained in:
Michael Abashian
2017-08-22 16:39:06 -04:00
committed by GitHub
parent 05b4bff388 0daa203fe0
commit 4e6722a171
3 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/client/src/shared/Utilities.js
View File

@@ -640,10 +640,6 @@ angular.module('Utilities', ['RestServices', 'Utilities'])
// Don't toggle the dropdown when a multiselect option is // Don't toggle the dropdown when a multiselect option is
// being removed // being removed
if (multiple) { if (multiple) {
if (params.disabledOptions) {
$(element).on('select2:selecting', e => e.preventDefault());
}
$(element).on('select2:opening', (e) => { $(element).on('select2:opening', (e) => {
var unselecting = $(e.target).data('select2-unselecting'); var unselecting = $(e.target).data('select2-unselecting');
if (unselecting === true) { if (unselecting === true) {

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

@@ -17,8 +17,7 @@ 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: true, customDropdownAdapter: scope.preview ? false : true
disabledOptions: scope.preview ? true : false
}); });
}); });

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

@@ -11,6 +11,7 @@
choices="choices" choices="choices"
ng-required="isRequired === 'true'" ng-required="isRequired === 'true'"
ng-model="defaultValue" ng-model="defaultValue"
ng-disabled="isDisabled === 'true'"
preview="preview"> preview="preview">
</multiple-choice> </multiple-choice>
</div> </div>