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

git commit: updated refs/heads/4.3-forward to 1ad7bce

Updated Branches:
  refs/heads/4.3-forward d38a50343 -> 1ad7bce69


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/1ad7bce6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1ad7bce6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1ad7bce6

Branch: refs/heads/4.3-forward
Commit: 1ad7bce69b764d3d833a8682ec5016bfbeea394c
Parents: d38a503
Author: Jessica Wang <je...@apache.org>
Authored: Wed Jan 29 15:40:14 2014 -0800
Committer: Jessica Wang <je...@apache.org>
Committed: Wed Jan 29 15:40:14 2014 -0800

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1ad7bce6/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 4e1ce05..2cb3973 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;
                             }