Updated Branches: refs/heads/master a99694b82 -> ebd4b8fa9
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/ebd4b8fa Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ebd4b8fa Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ebd4b8fa Branch: refs/heads/master Commit: ebd4b8fa9f77be01f1eb156d496c3b7ad60abed5 Parents: a99694b Author: Jessica Wang <[email protected]> Authored: Fri Oct 18 11:56:07 2013 -0700 Committer: Jessica Wang <[email protected]> Committed: Fri Oct 18 11:57:01 2013 -0700 ---------------------------------------------------------------------- ui/scripts/network.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ebd4b8fa/ui/scripts/network.js ---------------------------------------------------------------------- diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 80ddbcb..78f788b 100755 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -1952,7 +1952,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 @@ -1960,7 +1960,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 } },
