CLOUDSTACK-4713: UI > EIP/ELB Basic Zone - fix a bug that IPs that are acquired are not showing in listView of IP Addresses page under Network menu.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e81a2b4f Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e81a2b4f Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e81a2b4f Branch: refs/heads/4.2 Commit: e81a2b4ff29553f458ddabcad7e97236df2b52bc Parents: fa29794 Author: Jessica Wang <jessicaw...@apache.org> Authored: Thu Sep 19 16:44:42 2013 -0700 Committer: Jessica Wang <jessicaw...@apache.org> Committed: Thu Sep 19 16:47:16 2013 -0700 ---------------------------------------------------------------------- ui/scripts/network.js | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e81a2b4f/ui/scripts/network.js ---------------------------------------------------------------------- diff --git a/ui/scripts/network.js b/ui/scripts/network.js index a09e565..9d4cf38 100755 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -2057,6 +2057,8 @@ var data = {}; listViewDataProvider(args, data); + //The following 10 lines caused CLOUDSTACK-4713 (EIP/ELB Basic Zone - unable to see any IPs that are acquired) + /* if (g_supportELB == "guest") // IPs are allocated on guest network $.extend(data, { forvirtualnetwork: false, @@ -2067,6 +2069,7 @@ forvirtualnetwork: true, forloadbalancing: true }); + */ if (args.context.networks) { $.extend(data, {
