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

CS:15792- S2S VPN : A tier created in VPC from a domain-admin account does not show up in the VPC configuration page. Instead, it is seen in the guest networks page

This commit is contained in:
Pranav Saxena 2012-08-02 02:59:30 +05:30
parent 505a9ad982
commit 6cc7cda9ce
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ui/scripts/vpc.js
View File

@ -1888,14 +1888,26 @@
},
// Get tiers
dataProvider: function(args) {
dataProvider: function(args) {
var data = { vpcid: args.context.vpc[0].id };
if (isDomainAdmin()) {
$.extend(data, {
account: args.context.users[0].account,
domainid: args.context.users[0].domainid
});
}
else {
$.extend(data, {
listAll: true
});
}
$.ajax({
url: createURL("listNetworks"),
dataType: "json",
data: {
vpcid: args.context.vpc[0].id,
listAll: true
},
data: data,
async: true,
success: function(json) {
var networks = json.listnetworksresponse.network;