External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-07 09:27:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #399 from jaredevantabor/inventory-source-select2-fix

Browse Source 
Removing search field on select2 fields used in inventory sources tab.
This commit is contained in:
jaredevantabor
2015-09-03 11:47:46 -07:00
parent e46cc161fa 8aa9325e43
commit a468f0936f
2 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -695,25 +695,26 @@ angular.module('Utilities', ['RestServices', 'Utilities', 'sanitizeFilter'])
options = params.opts; options = params.opts;
$.fn.select2.amd.require([ $.fn.select2.amd.require([
"select2/utils", 'select2/utils',
"select2/dropdown", 'select2/dropdown',
"select2/dropdown/attachContainer", 'select2/dropdown/search',
"select2/dropdown/search", 'select2/dropdown/attachContainer',
], function (Utils, DropdownAdapter, AttachContainer, DropdownSearch) { 'select2/dropdown/closeOnSelect',
'select2/dropdown/minimumResultsForSearch'
], function (Utils, Dropdown, Search, AttachContainer, CloseOnSelect, MinimumResultsForSearch) {
var CustomAdapter = Utils.Decorate( var CustomAdapter =
Utils.Decorate( _.reduce([Search, AttachContainer, CloseOnSelect, MinimumResultsForSearch],
DropdownAdapter, function(Adapter, Decorator) {
DropdownSearch return Utils.Decorate(Adapter, Decorator);
), }, Dropdown);
AttachContainer
);
$(element).select2({ $(element).select2({
dropdownAdapter: CustomAdapter,
multiple: 'true', multiple: 'true',
theme: "bootstrap", theme: "bootstrap",
width: '100%' width: '100%',
minimumResultsForSearch: Infinity,
dropdownAdapter: CustomAdapter
}); });
if(options){ if(options){
for (var d = 0; d < $(element + " option").length; d++) { for (var d = 0; d < $(element + " option").length; d++) {

11
awx/ui/client/src/shared/form-generator.js
View File

@@ -1117,15 +1117,18 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
html += buildId(field, fld, this.form); html += buildId(field, fld, this.form);
html += (options.mode === 'edit' && field.editRequired) ? "required " : ""; html += (options.mode === 'edit' && field.editRequired) ? "required " : "";
html += (options.mode === 'add' && field.addRequired) ? "required " : ""; html += (options.mode === 'add' && field.addRequired) ? "required " : "";
//used for select2 combo boxes
html += (field.multiSelect) ? "multiple " : ""; html += (field.multiSelect) ? "multiple " : "";
html += (field.readonly) ? "disabled " : ""; html += (field.readonly) ? "disabled " : "";
html += (field.awRequiredWhen) ? "data-awrequired-init=\"" + field.awRequiredWhen.init + "\" aw-required-when=\"" + html += (field.awRequiredWhen) ? "data-awrequired-init=\"" + field.awRequiredWhen.init + "\" aw-required-when=\"" +
field.awRequiredWhen.variable + "\" " : ""; field.awRequiredWhen.variable + "\" " : "";
html += ">\n"; html += ">\n";
html += "<option value=\"\">"; if(!field.multiSelect){
// Add a custom default select 'value' (default text) html += "<option value=\"\">";
html += (field.defaultText) ? field.defaultText : "Choose a " + field.label.toLowerCase(); // Add a custom default select 'value' (default text)
html += "</option>\n"; html += (field.defaultText) ? field.defaultText : "Choose a " + field.label.toLowerCase();
html += "</option>\n";
}
html += "</select>\n"; html += "</select>\n";
// Add error messages // Add error messages
if ((options.mode === 'add' && field.addRequired) || (options.mode === 'edit' && field.editRequired) || if ((options.mode === 'add' && field.addRequired) || (options.mode === 'edit' && field.editRequired) ||