cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mc...@apache.org
Subject [03/50] [abbrv] git commit: updated refs/heads/rbac to 929fbab
Date Fri, 17 Jan 2014 22:40:05 GMT
CLOUDSTACK-5557: UI > Network > VPC > Router > Public IP Address > fix a bug
that Configuration tab was wrongly hidden.


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

Branch: refs/heads/rbac
Commit: 6282e8e9ca8906952b9d710ad1e439c965e0a0b0
Parents: f58d77c
Author: Jessica Wang <jessicawang@apache.org>
Authored: Tue Jan 14 10:54:49 2014 -0800
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Tue Jan 14 10:56:06 2014 -0800

----------------------------------------------------------------------
 ui/scripts/network.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6282e8e9/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 610b1bdc..c404b55 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -2222,7 +2222,11 @@
                                 }
                             }
 
-                            if (ipAddress.vpcid || ipAddress.issourcenat) {
+                            if (ipAddress.issourcenat) {
+                                disableIpRules = true;
+                            }
+                            
+                            if (('vpc' in args.context) == false && ipAddress.vpcid
!= null) { //from Guest Network section, don't show Configuration(ipRules) tab on VPC IP
                                 disableIpRules = true;
                             }
 


Mime
View raw message