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

Rolled back several survey question enhancements which caused drag and drop to break

Browse Source
This commit is contained in:
mabashian 2017-08-21 09:23:34 -04:00
parent 708efbd165
commit 0daa203fe0
3 changed files with 2 additions and 6 deletions
Show Stats 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
// 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) {

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'),
multiple: scope.isMultipleSelect(),
minimumResultsForSearch: scope.isMultipleSelect() ? Infinity : 10,
customDropdownAdapter: true,
disabledOptions: scope.preview ? true : false
customDropdownAdapter: scope.preview ? false : true
});
});

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

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