cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jessicaw...@apache.org
Subject git commit: updated refs/heads/4.2-forward to cae8b39
Date Fri, 13 Sep 2013 02:21:27 GMT
Updated Branches:
  refs/heads/4.2-forward a096c9667 -> cae8b39b4


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.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cae8b39b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cae8b39b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cae8b39b

Branch: refs/heads/4.2-forward
Commit: cae8b39b43fd9055243268b7b0ad4ccdc4971379
Parents: a096c96
Author: Jessica Wang <jessicawang@apache.org>
Authored: Thu Sep 12 19:11:13 2013 -0700
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Thu Sep 12 19:21:13 2013 -0700

----------------------------------------------------------------------
 ui/scripts/network.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cae8b39b/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 0afa360..a09e565 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) {


Mime
View raw message