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/14 19:56:16 UTC
git commit: updated refs/heads/master to 6282e8e
Updated Branches:
refs/heads/master f58d77c8d -> 6282e8e9c
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/master
Commit: 6282e8e9ca8906952b9d710ad1e439c965e0a0b0
Parents: f58d77c
Author: Jessica Wang <je...@apache.org>
Authored: Tue Jan 14 10:54:49 2014 -0800
Committer: Jessica Wang <je...@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;
}