cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [2/2] git commit: refs/heads/ui-multiple-nics - Pass VM guest IP to enable static NAT action
Date Fri, 08 Mar 2013 22:38:50 GMT
Updated Branches:
  refs/heads/ui-multiple-nics a9387dfc5 -> fd7ce8bb8


Pass VM guest IP to enable static NAT action


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

Branch: refs/heads/ui-multiple-nics
Commit: fd7ce8bb8806e8c6c0147780630477dfacc9fb90
Parents: ccbad34
Author: Brian Federle <brian.federle@citrix.com>
Authored: Fri Mar 8 14:38:37 2013 -0800
Committer: Brian Federle <brian.federle@citrix.com>
Committed: Fri Mar 8 14:38:37 2013 -0800

----------------------------------------------------------------------
 ui/scripts/network.js                   |    6 +++++-
 ui/scripts/ui-custom/enableStaticNAT.js |    3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fd7ce8bb/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 7eb7ab5..4b23f6f 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -1685,7 +1685,7 @@
                             args.response.success({ data: null });
                             return;             
                           }
-                          
+
                           if('vpc' in args.context) {
                             if($tierSelect.size() && $tierSelect.val() != '-1' ){

                               data.networkid = $tierSelect.val();
@@ -1737,6 +1737,10 @@
 												ipaddressid: args.context.ipAddresses[0].id,
 												virtualmachineid: args.context.instances[0].id
 											};
+
+                      if (args._subselect && args._subselect != -1) {
+                        data.vmguestip = args._subselect;
+                      }
 											
 											if('vpc' in args.context) {
 											  if(args.tierID == '-1') {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fd7ce8bb/ui/scripts/ui-custom/enableStaticNAT.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui-custom/enableStaticNAT.js b/ui/scripts/ui-custom/enableStaticNAT.js
index 47d5dd2..1b2bf7b 100644
--- a/ui/scripts/ui-custom/enableStaticNAT.js
+++ b/ui/scripts/ui-custom/enableStaticNAT.js
@@ -92,9 +92,10 @@
               var start = args.start;
 
               start();
-              $dataList.fadeOut(function() {
+              $dataList.fadeOut(function() {                
                 action({
                   tierID: $dataList.find('.tier-select select').val(),
+                  _subselect: $dataList.find('tr.multi-edit-selected .subselect select').val(),
                   context: $.extend(true, {}, context, {
                     instances: [
                       $dataList.find('tr.multi-edit-selected').data('json-obj')


Mime
View raw message