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

bug 8636: remove non-used code.

This commit is contained in:
Jessica Wang 2011-03-03 12:59:26 -08:00
parent 1be21effc9
commit 2f2ea41a0d
6 changed files with 10 additions and 177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ui/scripts/cloud.core.account.js
View File

@ -133,27 +133,8 @@ function bindAddAccountButton() {
initDialog("dialog_add_account", 450);
var $dialogAddAccount = $("#dialog_add_account");
applyAutoCompleteToDomainField($dialogAddAccount.find("#domain"));
/*
$dialogAddAccount.find("#domain").autocomplete({
source: function(request, response) {
$.ajax({
data: createURL("command=listDomains&keyword=" + request.term),
dataType: "json",
success: function(json) {
domainObjs = json.listdomainsresponse.domain;
var array1 = [];
if(domainObjs != null && domainObjs.length > 0) {
for(var i=0; i < domainObjs.length; i++)
array1.push(fromdb(domainObjs[i].name));
}
response(array1);
}
});
}
});
*/
applyAutoCompleteToDomainField($dialogAddAccount.find("#domain"));
$("#add_account_button").unbind("click").bind("click", function(event) {
$dialogAddAccount

20
ui/scripts/cloud.core.diskoffering.js
View File

@ -87,25 +87,7 @@ function initAddDiskOfferingDialog() {
});
applyAutoCompleteToDomainField($dialogAddDisk.find("#domain"));
/*
$.ajax({
data: createURL("command=listDomains"),
dataType: "json",
async: false,
success: function(json) {
var $domainDropdown1 = $dialogAddDisk.find("#domain_dropdown").empty();
var $domainDropdown2 = $("#tab_content_details").find("#domain_edit").empty();
var domains = json.listdomainsresponse.domain;
if (domains != null && domains.length > 0) {
for (var i = 0; i < domains.length; i++) {
$domainDropdown1.append("<option value='" + fromdb(domains[i].id) + "'>" + fromdb(domains[i].name) + "</option>");
$domainDropdown2.append("<option value='" + fromdb(domains[i].id) + "'>" + fromdb(domains[i].name) + "</option>");
}
}
}
});
*/
$("#add_diskoffering_button").unbind("click").bind("click", function(event) {
$dialogAddDisk.find("#disk_name").val("");
$dialogAddDisk.find("#disk_description").val("");

21
ui/scripts/cloud.core.domain.js
View File

@ -139,27 +139,6 @@ function initAddDomainDialog() {
autoCompleteDomains.push(jsonObj);
applyAutoCompleteToDomainField($dialogAddDomain.find("#parent_domain"));
/*
$.ajax({
data: createURL("command=listDomains"),
dataType: "json",
async: false,
success: function(json) {
var $domainDropdown1 = $dialogAddDomain.find("#domain_dropdown").empty();
var domains = json.listdomainsresponse.domain;
if (domains != null && domains.length > 0) {
for (var i = 0; i < domains.length; i++) {
$domainDropdown1.append("<option value='" + fromdb(domains[i].id) + "'>" + fromdb(domains[i].name) + "</option>");
}
}
var $thisTab = $("#right_panel_content").find("#tab_content_details");
var domainId = $thisTab.find("#id").text(); //get domainId from here in case domain page is empty (e.g. when a domain was just deleted)
if(domainId != null && domainId.length > 0)
$domainDropdown1.val(domainId);
}
});
*/
$dialogAddDomain
.dialog('option', 'buttons', {

25
ui/scripts/cloud.core.init.js
View File

@ -473,29 +473,8 @@ $(document).ready(function() {
zoneSelect.change();
}
}
applyAutoCompleteToDomainField($advancedSearchPopup.find("#domain"));
/*
var domainSelect = $advancedSearchPopup.find("#adv_search_domain");
if(domainSelect.length>0 && $advancedSearchPopup.find("#adv_search_domain_li").css("display")!="none") {
$.ajax({
data: createURL("command=listDomains&available=true"),
dataType: "json",
success: function(json) {
var domains = json.listdomainsresponse.domain;
domainSelect.empty();
domainSelect.append("<option value=''>" + g_dictionary["label.by.domain"] + "</option>");
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>");
}
}
}
});
}
*/
applyAutoCompleteToDomainField($advancedSearchPopup.find("#domain"));
$advancedSearchPopup.find("#adv_search_startdate, #adv_search_enddate").datepicker({dateFormat: 'yy-mm-dd'});
}

78
ui/scripts/cloud.core.network.js
View File

@ -552,45 +552,10 @@ function bindAddIpRangeToPublicNetworkButton($button, $midmenuItem1) {
$dialogAddIpRangeToPublicNetwork.find("#add_publicip_vlan_scope").change(); // default value of "#add_publicip_vlan_scope" is "zone-wide". Calling change() will hide "#domain_container", "#add_publicip_vlan_account_container".
if(zoneObj.domainid != null) { //list only domains under zoneObj.domainid
applyAutoCompleteToDomainChildrenField($dialogAddIpRangeToPublicNetwork.find("#domain"), zoneObj.domainid);
/*
domainSelect.append("<option value='" + zoneObj.domainid + "'>" + fromdb(zoneObj.domain) + "</option>");
function populateDomainDropdown(id) {
$.ajax({
data: createURL("command=listDomainChildren&id="+id),
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);
*/
applyAutoCompleteToDomainChildrenField($dialogAddIpRangeToPublicNetwork.find("#domain"), zoneObj.domainid);
}
else { //list all domains
applyAutoCompleteToDomainField($dialogAddIpRangeToPublicNetwork.find("#domain"));
/*
$.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>");
}
}
}
});
*/
applyAutoCompleteToDomainField($dialogAddIpRangeToPublicNetwork.find("#domain"));
}
$dialogAddIpRangeToPublicNetwork
@ -1249,45 +1214,10 @@ function bindAddNetworkButton($button) {
}
else {
if(zoneObj.domainid != null) { //list only domains under zoneObj.domainid
applyAutoCompleteToDomainChildrenField($dialogAddNetworkForZone.find("#domain"), zoneObj.domainid);
/*
domainSelect.append("<option value='" + zoneObj.domainid + "'>" + fromdb(zoneObj.domain) + "</option>");
function populateDomainDropdown(id) {
$.ajax({
data: createURL("command=listDomainChildren&id="+id),
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);
*/
applyAutoCompleteToDomainChildrenField($dialogAddNetworkForZone.find("#domain"), zoneObj.domainid);
}
else { //list all domains
applyAutoCompleteToDomainField($dialogAddNetworkForZone.find("#domain"));
/*
$.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>");
}
}
}
});
*/
applyAutoCompleteToDomainField($dialogAddNetworkForZone.find("#domain"));
}
}

20
ui/scripts/cloud.core.serviceoffering.js
View File

@ -75,25 +75,7 @@ function initAddServiceOfferingDialog() {
});
applyAutoCompleteToDomainField($dialogAddService.find("#domain"));
/*
$.ajax({
data: createURL("command=listDomains"),
dataType: "json",
async: false,
success: function(json) {
var $domainDropdown1 = $dialogAddService.find("#domain_dropdown").empty();
var $domainDropdown2 = $("#tab_content_details").find("#domain_edit").empty();
var domains = json.listdomainsresponse.domain;
if (domains != null && domains.length > 0) {
for (var i = 0; i < domains.length; i++) {
$domainDropdown1.append("<option value='" + fromdb(domains[i].id) + "'>" + fromdb(domains[i].name) + "</option>");
$domainDropdown2.append("<option value='" + fromdb(domains[i].id) + "'>" + fromdb(domains[i].name) + "</option>");
}
}
}
});
*/
$("#add_serviceoffering_button").unbind("click").bind("click", function(event) {
$dialogAddService.find("#add_service_name").val("");
$dialogAddService.find("#add_service_display").val("");