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

cloudStack 3.0 new UI - create zone - call listCapabilities to refresh global variable after update network service provider completes.

This commit is contained in:
Jessica Wang 2011-11-16 10:41:50 -08:00
parent 33ebebf638
commit 5d329bc623
1 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
ui/scripts/system.js
View File

@ -884,8 +884,8 @@
dataType: "json",
async: false,
success: function(json) {
var zoneObj = json.createzoneresponse.zone;
args.response.success({data: zoneObj});
var zoneObj = json.createzoneresponse.zone;
args.response.success({data: zoneObj}); //spinning wheel appears from this moment
zoneId = zoneObj.id;
//NaaS (begin)
@ -1001,6 +1001,35 @@
$("body").stopTime(timerKey);
if (result.jobstatus == 1) {
//alert("updateNetworkServiceProvider succeeded.");
/*
$.ajax({
url: createURL("listCapabilities"),
dataType: "json",
async: false,
success: function(json) {
// g_supportELB: "guest" <20> ips are allocated on guest network (so use 'forvirtualnetwork' = false)
// g_supportELB: "public" - ips are allocated on public network (so use 'forvirtualnetwork' = true)
// g_supportELB: "false" <20> no ELB support
g_supportELB = json.listcapabilitiesresponse.capability.supportELB.toString(); //convert boolean to string if it's boolean
$.cookie('supportELB', g_supportELB, { expires: 1});
g_firewallRuleUiEnabled = json.listcapabilitiesresponse.capability.firewallRuleUiEnabled.toString(); //convert boolean to string if it's boolean
$.cookie('firewallRuleUiEnabled', g_firewallRuleUiEnabled, { expires: 1});
if (json.listcapabilitiesresponse.capability.userpublictemplateenabled != null) {
g_userPublicTemplateEnabled = json.listcapabilitiesresponse.capability.userpublictemplateenabled.toString(); //convert boolean to string if it's boolean
$.cookie('userpublictemplateenabled', g_userPublicTemplateEnabled, { expires: 1});
}
if (json.listcapabilitiesresponse.capability.securitygroupsenabled != null) {
g_directAttachSecurityGroupsEnabled = json.listcapabilitiesresponse.capability.securitygroupsenabled.toString(); //convert boolean to string if it's boolean
$.cookie('directattachsecuritygroupsenabled', g_directAttachSecurityGroupsEnabled, { expires: 1});
}
}
});
*/
}
else if (result.jobstatus == 2) {
alert("updateNetworkServiceProvider failed. Error: " + fromdb(result.jobresult.errortext));
@ -1044,34 +1073,6 @@
}
});
//NaaS (end)
/*
$.ajax({
url: createURL("listCapabilities"),
dataType: "json",
async: false,
success: function(json) {
// g_supportELB: "guest" <20> ips are allocated on guest network (so use 'forvirtualnetwork' = false)
// g_supportELB: "public" - ips are allocated on public network (so use 'forvirtualnetwork' = true)
// g_supportELB: "false" <20> no ELB support
g_supportELB = json.listcapabilitiesresponse.capability.supportELB.toString(); //convert boolean to string if it's boolean
$.cookie('supportELB', g_supportELB, { expires: 1});
g_firewallRuleUiEnabled = json.listcapabilitiesresponse.capability.firewallRuleUiEnabled.toString(); //convert boolean to string if it's boolean
$.cookie('firewallRuleUiEnabled', g_firewallRuleUiEnabled, { expires: 1});
if (json.listcapabilitiesresponse.capability.userpublictemplateenabled != null) {
g_userPublicTemplateEnabled = json.listcapabilitiesresponse.capability.userpublictemplateenabled.toString(); //convert boolean to string if it's boolean
$.cookie('userpublictemplateenabled', g_userPublicTemplateEnabled, { expires: 1});
}
if (json.listcapabilitiesresponse.capability.securitygroupsenabled != null) {
g_directAttachSecurityGroupsEnabled = json.listcapabilitiesresponse.capability.securitygroupsenabled.toString(); //convert boolean to string if it's boolean
$.cookie('directattachsecuritygroupsenabled', g_directAttachSecurityGroupsEnabled, { expires: 1});
}
}
});
*/
},
error: function(XMLHttpResponse) {
var errorMsg = parseXMLHttpResponse(XMLHttpResponse);