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 2013/10/18 20:56:29 UTC
git commit: updated refs/heads/4.2 to 7d303d9
Updated Branches:
refs/heads/4.2 5eb5594e8 -> 7d303d986
cloudstack UI: IP Addresses page > change logic of hiding/showing Acquire New IP button since args.context does contain networks property even it's from VPC section.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7d303d98
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7d303d98
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7d303d98
Branch: refs/heads/4.2
Commit: 7d303d9868d4d402d4bc3ce4baf014eae55486e0
Parents: 5eb5594
Author: Jessica Wang <je...@apache.org>
Authored: Fri Oct 18 11:56:07 2013 -0700
Committer: Jessica Wang <je...@apache.org>
Committed: Fri Oct 18 11:56:19 2013 -0700
----------------------------------------------------------------------
ui/scripts/network.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7d303d98/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index f6dc167..35b4507 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -1958,7 +1958,7 @@
}
//*** from Guest Network section ***
- if ('networks' in args.context) {
+ if (!('vpc' in args.context)) {
if (args.context.networks[0].vpcid == null) { //Guest Network section > non-VPC network, show Acquire IP button
return true;
} else { //Guest Network section > VPC network, hide Acquire IP button
@@ -1966,7 +1966,7 @@
}
}
//*** from VPC section ***
- else { //'vpc' in args.context
+ else { //'vpc' in args.context //args.context.networks[0] has only one property => name: 'Router'
return true; //VPC section, show Acquire IP button
}
},