You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2012/07/10 20:24:17 UTC
git commit: CS-15475: Fix missing 'add guest network' action from
network list
Updated Branches:
refs/heads/master 3bbb69441 -> b000b8047
CS-15475: Fix missing 'add guest network' action from network list
Original patch by: Pranav Saxena <pr...@citrix.com>
Reviewed by: Brian Federle <br...@citrix.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/b000b804
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/b000b804
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/b000b804
Branch: refs/heads/master
Commit: b000b8047e33073fb79811daa362be7527034152
Parents: 3bbb694
Author: Brian Federle <br...@citrix.com>
Authored: Tue Jul 10 11:23:18 2012 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Tue Jul 10 11:24:07 2012 -0700
----------------------------------------------------------------------
ui/scripts/network.js | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b000b804/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
}
});