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 b090aca
Date Fri, 10 Jan 2014 18:50:08 GMT
Updated Branches:
  refs/heads/master 598628f51 -> b090acacf


CLOUDSTACK-5557: UI > Network > Guest Network > IP Address > fix a bug that SourceNAT
IP, VPC tier IP wrongly showed Configuration tab(firewall/portforwarding/loadbalancing).

SourceNAT IP, VPC tier IP should not show Configuration tab(firewall/portforwarding/loadbalancing).


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

Branch: refs/heads/master
Commit: b090acacfafbdb3d480a00640131bddb4c9081ab
Parents: 598628f
Author: Jessica Wang <jessica.wang@citrix.com>
Authored: Thu Jan 9 14:53:56 2014 -0800
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Fri Jan 10 10:49:56 2014 -0800

----------------------------------------------------------------------
 ui/scripts/network.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b090acac/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 9eaf028..d352320 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -2222,12 +2222,14 @@
                                 }
                             }
 
-                            if (ipAddress.vpcid && ipAddress.issourcenat) {
+                            if (ipAddress.vpcid || ipAddress.issourcenat) {
                                 disableIpRules = true;
                             }
 
-                            if (disableVpn) disabledTabs.push('vpn');
-                            if (disableIpRules) disabledTabs.push('ipRules');
+                            if (disableVpn) 
+                            	disabledTabs.push('vpn');
+                            if (disableIpRules) 
+                            	disabledTabs.push('ipRules');
 
                             return disabledTabs;
                         },


Mime
View raw message