You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2014/01/30 23:41:20 UTC

[29/50] [abbrv] git commit: updated refs/heads/ui-restyle to 849d601

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/ui-restyle
Commit: 23f3047e7d4e0d53f830a9a316d9ec37cbfd0b3f
Parents: 18a3d3c
Author: Jessica Wang <je...@apache.org>
Authored: Tue Jan 28 11:42:55 2014 -0800
Committer: Jessica Wang <je...@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;
                             }