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

IP addresses: fix for projects + port forwarding

Browse Source 
-Port forwarding: only show VMs of the IP's owner

-Don't pass account/domain ID for acquire IP address and list VMs for
 static NAT/PF/LB
This commit is contained in:
bfederle 2012-05-10 17:04:55 -07:00
parent a206683268
commit 562dd29bfb
1 changed files with 45 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
ui/scripts/network.js
View File

@ -928,7 +928,7 @@
addRow: 'true',
action: function(args) {
var apiCmd = "associateIpAddress";
if(args.context.networks[0].type == "Shared")
if(args.context.networks[0].type == "Shared" && !args.context.projects)
apiCmd += "&domainid=" + g_domainid + "&account=" + g_account;
$.ajax({
url: createURL(apiCmd),
@ -1174,16 +1174,23 @@
listView: $.extend(true, {}, cloudStack.sections.instances, {
listView: {
dataProvider: function(args) {
var data = {
page: args.page,
pageSize: pageSize,
networkid: args.context.networks[0].id,
listAll: true
};
if (!args.context.projects) {
$.extend(data, {
account: args.context.ipAddresses[0].account,
domainid: args.context.ipAddresses[0].domainid
});
}
$.ajax({
url: createURL('listVirtualMachines'),
data: {
page: args.page,
pageSize: pageSize,
networkid: args.context.networks[0].id,
account: args.context.ipAddresses[0].account,
domainid: args.context.ipAddresses[0].domainid,
listAll: true
},
data: data,
dataType: 'json',
async: true,
success: function(data) {
@ -1758,17 +1765,23 @@
dataProvider: function(args) {
var itemData = $.isArray(args.context.multiRule) && args.context.multiRule[0]['_itemData'] ?
args.context.multiRule[0]['_itemData'] : [];
var data = {
page: args.page,
pageSize: pageSize,
networkid: args.context.ipAddresses[0].associatednetworkid,
listAll: true
};
if (!args.context.projects) {
$.extend(data, {
account: args.context.ipAddresses[0].account,
domainid: args.context.ipAddresses[0].domainid
});
}
$.ajax({
url: createURL('listVirtualMachines'),
data: {
page: args.page,
pageSize: pageSize,
networkid: args.context.ipAddresses[0].associatednetworkid,
account: args.context.ipAddresses[0].account,
domainid: args.context.ipAddresses[0].domainid,
listAll: true
},
data: data,
dataType: 'json',
async: true,
success: function(data) {
@ -2124,14 +2137,23 @@
listView: $.extend(true, {}, cloudStack.sections.instances, {
listView: {
dataProvider: function(args) {
var data = {
page: args.page,
pageSize: pageSize,
listAll: true,
networkid: args.context.ipAddresses[0].associatednetworkid
};
if (!args.context.projects) {
$.extend(data, {
account: args.context.ipAddresses[0].account,
domainid: args.context.ipAddresses[0].domainid
});
}
$.ajax({
url: createURL('listVirtualMachines'),
data: {
page: args.page,
pageSize: pageSize,
listAll: true,
networkid: args.context.ipAddresses[0].associatednetworkid
},
data: data,
dataType: 'json',
async: true,
success: function(data) {