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

new UI - domain page - fix a bug that is caused by API refactor.

This commit is contained in:
Jessica Wang 2010-10-21 11:48:50 -07:00
parent 9a9146c07b
commit 0d5a7175d8
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/new/scripts/cloud.core2.domain.js
View File

@ -58,7 +58,7 @@ function afterLoadDomainJSP() {
if (domains != null && domains.length > 0) {
for (var i = 0; i < domains.length; i++) {
drawNode(domains[i], level, container);
if(domains[i].haschild == true)
if(domains[i].haschild == true || domains[i].haschild == "true") //After API refactor, returned boolean value is true/false instead of "true"/"false". For testing convenience (Some people might not have backend update-to-date), check both true and "true".
drawTree(domains[i].id, (level+1), $("#domain_children_container_"+domains[i].id));
}
}

27
ui/new/scripts/cloud.core2.init.js
View File

@ -57,19 +57,7 @@ $(document).ready(function() {
selectLeftMenu($(this));
listMidMenuItems("listAccounts", "listaccountsresponse", "account", "jsp/account.jsp", afterLoadAccountJSP, accountToMidmenu, accountToRigntPanel, getMidmenuId);
return false;
});
$("#leftmenu_domain").bind("click", function(event) {
selectLeftMenu($(this), true);
hideMiddleMenu();
disableMultipleSelectionInMidMenu();
clearMiddleMenu();
$("#right_panel").load("jsp/domain.jsp", function(){
afterLoadDomainJSP();
});
return false;
});
});
$("#leftmenu_events").bind("click", function(event) {
selectLeftMenu($(this), true);
return false;
@ -99,6 +87,19 @@ $(document).ready(function() {
bindAndListMidMenuItems("leftmenu_service_offering", "listServiceOfferings", "listserviceofferingsresponse", "serviceoffering", "jsp/serviceoffering.jsp", afterLoadServiceOfferingJSP, serviceOfferingToMidmenu, serviceOfferingToRigntPanel, getMidmenuId);
bindAndListMidMenuItems("leftmenu_disk_offering", "listDiskOfferings", "listdiskofferingsresponse", "diskoffering", "jsp/diskoffering.jsp", afterLoadDiskOfferingJSP, diskOfferingToMidmenu, diskOfferingToRigntPanel, getMidmenuId);
bindAndListMidMenuItems("leftmenu_global_setting", "listConfigurations", "listconfigurationsresponse", "configuration", "jsp/globalsetting.jsp", afterLoadGlobalSettingJSP, globalSettingToMidmenu, globalSettingToRigntPanel, globalSettingGetMidmenuId, getMidmenuId);
$("#leftmenu_domain").bind("click", function(event) {
selectLeftMenu($(this), true);
hideMiddleMenu();
disableMultipleSelectionInMidMenu();
clearMiddleMenu();
$("#right_panel").load("jsp/domain.jsp", function(){
afterLoadDomainJSP();
});
return false;
});
$("#leftmenu_resource").bind("click", function(event) {
showMiddleMenu();