mirror of
https://github.com/apache/cloudstack.git
synced 2025-11-03 04:12:31 +01:00
bug 8636: change domain dropdown to autoComplete input textbox - rename applyAutoComplete().
This commit is contained in:
parent
62b3d548d6
commit
901a31c898
@ -134,7 +134,7 @@ function bindAddAccountButton() {
|
||||
|
||||
var $dialogAddAccount = $("#dialog_add_account");
|
||||
|
||||
applyAutoComplete($dialogAddAccount.find("#domain"), "listDomains", "listdomainsresponse", "domain");
|
||||
applyAutoCompleteToDomainField($dialogAddAccount.find("#domain"), "listDomains", "listdomainsresponse", "domain");
|
||||
/*
|
||||
$dialogAddAccount.find("#domain").autocomplete({
|
||||
source: function(request, response) {
|
||||
@ -174,10 +174,10 @@ function bindAddAccountButton() {
|
||||
var domainName = $thisDialog.find("#domain").val();
|
||||
var domainId;
|
||||
if(domainName != null && domainName.length > 0) {
|
||||
if(autoCompleteItems != null && autoCompleteItems.length > 0) {
|
||||
for(var i=0; i < autoCompleteItems.length; i++) {
|
||||
if(fromdb(autoCompleteItems[i].name).toLowerCase() == domainName.toLowerCase()) {
|
||||
domainId = autoCompleteItems[i].id;
|
||||
if(autoCompleteDomains != null && autoCompleteDomains.length > 0) {
|
||||
for(var i=0; i < autoCompleteDomains.length; i++) {
|
||||
if(fromdb(autoCompleteDomains[i].name).toLowerCase() == domainName.toLowerCase()) {
|
||||
domainId = autoCompleteDomains[i].id;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@ -475,7 +475,7 @@ $(document).ready(function() {
|
||||
}
|
||||
|
||||
|
||||
applyAutoComplete($advancedSearchPopup.find("#domain"), "listDomains", "listdomainsresponse", "domain");
|
||||
applyAutoCompleteToDomainField($advancedSearchPopup.find("#domain"), "listDomains", "listdomainsresponse", "domain");
|
||||
|
||||
var domainSelect = $advancedSearchPopup.find("#adv_search_domain");
|
||||
if(domainSelect.length>0 && $advancedSearchPopup.find("#adv_search_domain_li").css("display")!="none") {
|
||||
|
||||
@ -41,10 +41,10 @@ function vmGetSearchParams() {
|
||||
var domainName = $advancedSearchPopup.find("#domain").val();
|
||||
if (domainName != null && domainName.length > 0) {
|
||||
var domainId;
|
||||
if(autoCompleteItems != null && autoCompleteItems.length > 0) {
|
||||
for(var i=0; i < autoCompleteItems.length; i++) {
|
||||
if(fromdb(autoCompleteItems[i].name).toLowerCase() == domainName.toLowerCase()) {
|
||||
domainId = autoCompleteItems[i].id;
|
||||
if(autoCompleteDomains != null && autoCompleteDomains.length > 0) {
|
||||
for(var i=0; i < autoCompleteDomains.length; i++) {
|
||||
if(fromdb(autoCompleteDomains[i].name).toLowerCase() == domainName.toLowerCase()) {
|
||||
domainId = autoCompleteDomains[i].id;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1051,20 +1051,20 @@ function getMidmenuId(jsonObj) {
|
||||
return "midmenuItem_" + jsonObj.id;
|
||||
}
|
||||
|
||||
var autoCompleteItems = [];
|
||||
function applyAutoComplete($field, commandString, jsonResponse1, jsonResponse2) {
|
||||
var autoCompleteDomains = [];
|
||||
function applyAutoCompleteToDomainField($field, commandString, jsonResponse1, jsonResponse2) {
|
||||
$field.autocomplete({
|
||||
source: function(request, response) {
|
||||
$.ajax({
|
||||
data: createURL("command="+commandString+"&keyword=" + request.term),
|
||||
data: createURL("command=listDomains&keyword=" + request.term),
|
||||
dataType: "json",
|
||||
async: false,
|
||||
success: function(json) {
|
||||
autoCompleteItems = json[jsonResponse1][jsonResponse2];
|
||||
autoCompleteDomains = json.listdomainsresponse.domain;
|
||||
var array1 = [];
|
||||
if(autoCompleteItems != null && autoCompleteItems.length > 0) {
|
||||
for(var i=0; i < autoCompleteItems.length; i++)
|
||||
array1.push(fromdb(autoCompleteItems[i].name));
|
||||
if(autoCompleteDomains != null && autoCompleteDomains.length > 0) {
|
||||
for(var i=0; i < autoCompleteDomains.length; i++)
|
||||
array1.push(fromdb(autoCompleteDomains[i].name));
|
||||
}
|
||||
response(array1);
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user