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

Merge pull request #6666 from mabashian/6443-typeahead-single-select-survey

Browse Source 
Added the ability to pass in minimumResultsForSearch when calling CreateSelect2
This commit is contained in:
Michael Abashian
2017-06-23 08:14:57 -04:00
committed by GitHub
parent 214e7a0cfe 2d872dc2be
commit e88b6e6e48
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -624,7 +624,8 @@ angular.module('Utilities', ['RestServices', 'Utilities'])
scope = params.scope, scope = params.scope,
selectOptions = params.options, selectOptions = params.options,
model = params.model, model = params.model,
original_options; original_options,
minimumResultsForSearch = params.minimumResultsForSearch ? params.minimumResultsForSearch : Infinity;
if (scope && selectOptions) { if (scope && selectOptions) {
original_options = _.cloneDeep(scope[selectOptions]); original_options = _.cloneDeep(scope[selectOptions]);
@@ -651,7 +652,7 @@ angular.module('Utilities', ['RestServices', 'Utilities'])
multiple: multiple, multiple: multiple,
containerCssClass: 'Form-dropDown', containerCssClass: 'Form-dropDown',
width: '100%', width: '100%',
minimumResultsForSearch: Infinity, minimumResultsForSearch: minimumResultsForSearch,
escapeMarkup: function(m) { escapeMarkup: function(m) {
return $filter('sanitize')(m); return $filter('sanitize')(m);
} }

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

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