From cae8b39b43fd9055243268b7b0ad4ccdc4971379 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Thu, 12 Sep 2013 19:11:13 -0700 Subject: [PATCH] CLOUDSTACK-4662: UI > Network > IP Address > select a portable IP Address > Port Forwarding > VM grid - select a VM - dropdown of VM NIC IP appears - dropdown option value is networkID + VmGuestIp, split it and pass only VmGuestIp to API call. --- ui/scripts/network.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 0afa3608177..a09e56515aa 100755 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -3842,10 +3842,20 @@ virtualmachineid: args.itemData[0].id, openfirewall: false }; + + if (args.context.ipAddresses[0].isportable) { + var subselect = args.itemData[0]._subselect.split(','); + //var networkid = subselect[0]; + var vmguestip = subselect[1]; - if (args.itemData[0]._subselect && args.itemData[0]._subselect != -1) { + //data.networkid = networkid; + + if (parseInt(vmguestip) !== -1) { + data.vmguestip = vmguestip; + } + } else if (args.itemData[0]._subselect && args.itemData[0]._subselect != -1) { data.vmguestip = args.itemData[0]._subselect; - } + } if ('vpc' in args.context) { //from VPC section if (args.data.tier == null) {