etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

new UI - populate domain dropdown with all domains if the zone is not dedicated to any domain.

This commit is contained in:
Jessica Wang 2010-11-08 12:09:35 -08:00
parent c03c3a171f
commit 14e3893f75
1 changed files with 37 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
ui/scripts/cloud.core.zone.js
View File

@ -317,27 +317,43 @@ function initAddVLANButton($addButton) {
});
var domainSelect = dialogAddVlanForZone.find("#add_publicip_vlan_domain").empty();
domainSelect.append("<option value='" + zoneObj.domainid + "'>" + fromdb(zoneObj.domain) + "</option>");
function populateDomainDropdown(id) {
$.ajax({
data: createURL("command=listDomainChildren&id="+id+"&pageSize=-1"),
dataType: "json",
async: false,
success: function(json) {
var domains = json.listdomainchildrenresponse.domain;
if (domains != null && domains.length > 0) {
for (var i = 0; i < domains.length; i++) {
domainSelect.append("<option value='" + domains[i].id + "'>" + fromdb(domains[i].name) + "</option>");
if(domains[i].haschild == true)
populateDomainDropdown(domains[i].id);
}
}
}
});
}
populateDomainDropdown(zoneObj.domainid);
if(zoneObj.domainid != null) { //list only domains under zoneObj.domainid
domainSelect.append("<option value='" + zoneObj.domainid + "'>" + fromdb(zoneObj.domain) + "</option>");
function populateDomainDropdown(id) {
$.ajax({
data: createURL("command=listDomainChildren&id="+id+"&pageSize=-1"),
dataType: "json",
async: false,
success: function(json) {
var domains = json.listdomainchildrenresponse.domain;
if (domains != null && domains.length > 0) {
for (var i = 0; i < domains.length; i++) {
domainSelect.append("<option value='" + domains[i].id + "'>" + fromdb(domains[i].name) + "</option>");
if(domains[i].haschild == true)
populateDomainDropdown(domains[i].id);
}
}
}
});
}
populateDomainDropdown(zoneObj.domainid);
}
else { //list all domains
$.ajax({
data: createURL("command=listDomains"),
dataType: "json",
success: function(json) {
var items = json.listdomainsresponse.domain;
if(items != null && items.length > 0) {
for(var i=0; i<items.length; i++) {
domainSelect.append("<option value='" + items[i].id + "'>" + fromdb(items[i].name) + "</option>");
}
}
}
});
}
}
dialogAddVlanForZone