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

bug 8636: (2.1.x UI) - remove non-used code.

This commit is contained in:
Jessica Wang 2011-03-03 11:38:15 -08:00
parent bd32d4e05a
commit c0b58bc7d5
3 changed files with 8 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ui/scripts/cloud.core.configuration.js
View File

@ -640,23 +640,7 @@ function showConfigurationTab() {
}
});
applyAutoCompleteToDomainField(dialogAddVlanForZone.find("#domain"));
/*
var domainSelect = dialogAddVlanForZone.find("#add_publicip_vlan_domain").empty();
$.ajax({
data: "command=listDomains&response=json",
dataType: "json",
async: false,
success: function(json) {
var domains = json.listdomainsresponse.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>");
}
}
}
});
*/
applyAutoCompleteToDomainField(dialogAddVlanForZone.find("#domain"));
}
dialogAddVlanForZone

5
ui/scripts/cloud.core.js
View File

@ -90,6 +90,7 @@ function applyAutoCompleteToDomainField($field) {
});
}
/*
function applyAutoCompleteToDomainChildrenField($field, parentDomainId) {
$field.autocomplete({
source: function(request, response) {
@ -122,6 +123,7 @@ function applyAutoCompleteToDomainChildrenField($field, parentDomainId) {
}
});
}
*/
// Role Functions
function isAdmin() {
@ -319,6 +321,7 @@ function submenuContentEventBinder(submenuContent, listFunction) {
applyAutoCompleteToDomainField(submenuContent.find("#advanced_search #domain"));
/*
var domainSelect = submenuContent.find("#advanced_search #adv_search_domain");
if(domainSelect.length>0 && isAdmin()) {
var domainSelect = domainSelect.empty();
@ -335,7 +338,7 @@ function submenuContentEventBinder(submenuContent, listFunction) {
}
});
}
*/
var vmSelect = submenuContent.find("#advanced_search").find("#adv_search_vm");
if(vmSelect.length>0) {

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

@ -209,25 +209,7 @@ function showNetworkingTab(p_domainId, p_account) {
//watermark (end)
$("#submenu_content_network #ip_searchbutton1").bind("click", refreshIpListContainerByInputBox);
/*
function populateDomainDropdown() {
var domainSelect = $("#submenu_content_network #search_by_domain").empty();
$.ajax({
data: "command=listDomains&available=true&response=json",
dataType: "json",
success: function(json) {
var domains = json.listdomainsresponse.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>");
}
}
}
});
}
*/
$("#submenu_content_network").find("#ip_searchbutton2").bind("click", function(event){
var $searchPanel2= $("#submenu_content_network").find("#ip_search_panel2");
@ -1048,10 +1030,8 @@ function showNetworkingTab(p_domainId, p_account) {
if(isAdmin()) {
submenuContent.find(".select_directipbg_admin").show();
submenuContent.find(".select_directipbg_user").hide();
applyAutoCompleteToDomainField($("#submenu_content_network #search_by_domain"));
//populateDomainDropdown();
submenuContent.find(".select_directipbg_user").hide();
applyAutoCompleteToDomainField($("#submenu_content_network #search_by_domain"));
} else {
submenuContent.find(".select_directipbg_admin").hide();
submenuContent.find(".select_directipbg_user").show();