From 2d872dc2becb36d6939e1b8acd89fd1edf27abd5 Mon Sep 17 00:00:00 2001 From: Michael Abashian Date: Wed, 21 Jun 2017 13:01:48 -0400 Subject: [PATCH] Added the ability to pass in minimumResultsForSearch when calling CreateSelect2 --- awx/ui/client/src/shared/Utilities.js | 5 +++-- .../survey-maker/render/multiple-choice.directive.js | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/awx/ui/client/src/shared/Utilities.js b/awx/ui/client/src/shared/Utilities.js index 05edd54917..9bfecdf780 100644 --- a/awx/ui/client/src/shared/Utilities.js +++ b/awx/ui/client/src/shared/Utilities.js @@ -624,7 +624,8 @@ angular.module('Utilities', ['RestServices', 'Utilities']) scope = params.scope, selectOptions = params.options, model = params.model, - original_options; + original_options, + minimumResultsForSearch = params.minimumResultsForSearch ? params.minimumResultsForSearch : Infinity; if (scope && selectOptions) { original_options = _.cloneDeep(scope[selectOptions]); @@ -651,7 +652,7 @@ angular.module('Utilities', ['RestServices', 'Utilities']) multiple: multiple, containerCssClass: 'Form-dropDown', width: '100%', - minimumResultsForSearch: Infinity, + minimumResultsForSearch: minimumResultsForSearch, escapeMarkup: function(m) { return $filter('sanitize')(m); } 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 6b30a42248..d22c548b84 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 @@ -16,6 +16,7 @@ function link($timeout, CreateSelect2, scope, element, attrs, ngModel) { CreateSelect2({ element: element.find('select'), multiple: scope.isMultipleSelect(), + minimumResultsForSearch: scope.isMultipleSelect() ? Infinity : 10, customDropdownAdapter: scope.preview ? false : true, disabledOptions: true });