apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-12-17 11:04:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 13554: system menu - zone detail - guest network page - Edit network - if network type is Isolated and network offering is changed, pop up a dialog box "Do you want to keep the current guest network CIDR unchanged?". Choosing Yes button will send "changecidr=false" to updateNetwork API. Choosing Cancel button will send "changecidr=true" to updateNetwork API.

Browse Source
This commit is contained in:
Jessica Wang 2012-02-09 16:50:30 -08:00
parent a3b2f3d118
commit 3da70d80bc
1 changed files with 54 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
ui/scripts/system.js
View File

@ -1398,14 +1398,62 @@
array1.push("&name=" + todb(args.data.name)); array1.push("&name=" + todb(args.data.name));
array1.push("&displaytext=" + todb(args.data.displaytext)); array1.push("&displaytext=" + todb(args.data.displaytext));
//args.data.networkofferingid is null when networkofferingid field is hidden
if(args.data.networkofferingid != null && args.data.networkofferingid != selectedGuestNetworkObj.networkofferingid)
array1.push("&networkofferingid=" + todb(args.data.networkofferingid));
//args.data.networkdomain is null when networkdomain field is hidden //args.data.networkdomain is null when networkdomain field is hidden
if(args.data.networkdomain != null && args.data.networkdomain != selectedGuestNetworkObj.networkdomain) if(args.data.networkdomain != null && args.data.networkdomain != selectedGuestNetworkObj.networkdomain)
array1.push("&networkdomain=" + todb(args.data.networkdomain)); array1.push("&networkdomain=" + todb(args.data.networkdomain));
//args.data.networkofferingid is null when networkofferingid field is hidden
if(args.data.networkofferingid != null && args.data.networkofferingid != args.context.networks[0].networkofferingid) {
array1.push("&networkofferingid=" + todb(args.data.networkofferingid));
if(args.context.networks[0].type == "Isolated") { //Isolated network
cloudStack.dialog.confirm({
message: 'Do you want to keep the current guest network CIDR unchanged?',
action: function() { //"Yes" button is clicked
array1.push("&changecidr=false");
$.ajax({
url: createURL("updateNetwork&id=" + args.context.networks[0].id + array1.join("")),
dataType: "json",
success: function(json) {
var jid = json.updatenetworkresponse.jobid;
args.response.success(
{_custom:
{jobId: jid,
getUpdatedItem: function(json) {
var item = json.queryasyncjobresultresponse.jobresult.network;
return {data: item};
}
}
}
);
}
});
},
cancelAction: function() { //"Cancel" button is clicked
array1.push("&changecidr=true");
$.ajax({
url: createURL("updateNetwork&id=" + args.context.networks[0].id + array1.join("")),
dataType: "json",
success: function(json) {
var jid = json.updatenetworkresponse.jobid;
args.response.success(
{_custom:
{jobId: jid,
getUpdatedItem: function(json) {
var item = json.queryasyncjobresultresponse.jobresult.network;
return {data: item};
}
}
}
);
}
});
}
});
return;
}
}
$.ajax({ $.ajax({
url: createURL("updateNetwork&id=" + args.context.networks[0].id + array1.join("")), url: createURL("updateNetwork&id=" + args.context.networks[0].id + array1.join("")),
dataType: "json", dataType: "json",