CS-15475:Not showing Add GuestNetwork Tab in Network in multi zone setup of advanced and basic zones together
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/9eebdd80 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/9eebdd80 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/9eebdd80 Branch: refs/heads/vpc Commit: 9eebdd808d6b48e9b8d573cd4c337a3c55f17d8c Parents: 692e8fb Author: Pranav Saxena <[email protected]> Authored: Tue Jul 10 15:40:14 2012 +0530 Committer: Pranav Saxena <[email protected]> Committed: Tue Jul 10 15:40:14 2012 +0530 ---------------------------------------------------------------------- ui/scripts/network.js | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9eebdd80/ui/scripts/network.js ---------------------------------------------------------------------- diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 150ade2..baeb972 100644 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -197,7 +197,7 @@ label: 'label.add.guest.network', preFilter: function(args) { - var basicZoneExists = false; + var basicZoneExists = true; //Modifying the logic behind displaying the tabs depending on the networktype $.ajax({ url: createURL("listZones"), dataType: "json", @@ -206,8 +206,8 @@ if(json.listzonesresponse.zone != null && json.listzonesresponse.zone.length > 0) { zoneObjs = json.listzonesresponse.zone; $(zoneObjs).each(function() { - if(this.networktype == "Basic") { - basicZoneExists = true; + if(this.networktype == "Advanced") { + basicZoneExists = false; // For any occurence of an Advanced zone with any combination of basic zone , the add guest network tab will be displayed return false; //break each loop } });
