You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by pr...@apache.org on 2012/11/29 01:01:18 UTC

[36/50] [abbrv] git commit: CLOUDSTACK-537: cloudstack UI - Advanced SG-Enabled zone - zone wizard - hide public traffic step.

CLOUDSTACK-537: cloudstack UI - Advanced SG-Enabled zone - zone wizard - hide public traffic step.


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/759d434b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/759d434b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/759d434b

Branch: refs/heads/api_refactoring
Commit: 759d434ba3405a560edcbf50b50e5e7e2665fe9d
Parents: f97f963
Author: Jessica Wang <je...@citrix.com>
Authored: Mon Nov 26 11:59:52 2012 -0800
Committer: Jessica Wang <je...@citrix.com>
Committed: Mon Nov 26 11:59:52 2012 -0800

----------------------------------------------------------------------
 ui/scripts/zoneWizard.js |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/759d434b/ui/scripts/zoneWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
index 52b4c33..af29da5 100755
--- a/ui/scripts/zoneWizard.js
+++ b/ui/scripts/zoneWizard.js
@@ -232,7 +232,10 @@
 					$publicTrafficDesc.find('#for_advanced_zone').hide();					
         }
         else { //args.data['network-model'] == 'Advanced'          
-          isShown = true;					
+          if(args.data["zone-advanced-sg-enabled"] !=	"on")          
+					  isShown = true;					
+					else
+					  isShown = false;
 					
 					$publicTrafficDesc.find('#for_advanced_zone').css('display', 'inline');
 					$publicTrafficDesc.find('#for_basic_zone').hide();