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/master to 23f3047
Date Tue, 28 Jan 2014 19:44:47 GMT
Updated Branches:
  refs/heads/master 18a3d3c3b -> 23f3047e7


CLOUDSTACK-5970: UI > network menu > guest network section > select non-VPC isolated
network with SourceNAT enabled > IP Address section > select sourceNAT IP > show
Configuration tab.


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

Branch: refs/heads/master
Commit: 23f3047e7d4e0d53f830a9a316d9ec37cbfd0b3f
Parents: 18a3d3c
Author: Jessica Wang <jessicawang@apache.org>
Authored: Tue Jan 28 11:42:55 2014 -0800
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Tue Jan 28 11:44:09 2014 -0800

----------------------------------------------------------------------
 ui/scripts/network.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/23f3047e/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index e4cd8b0..0aa5473 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -2226,7 +2226,7 @@
                                 }
                             }
 
-                            if (ipAddress.issourcenat) {
+                            if (ipAddress.vpcid != null && ipAddress.issourcenat)
{ //don't show Configuration(ipRules) tab on VPC sourceNAT IP
                                 disableIpRules = true;
                             }
                             


Mime
View raw message