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
[35/50] [abbrv] git commit: CLOUDSTACK-537: cloudstack UI - Advanced
SG-Enabled zone - zone wizard - physical network step - remove public traffic
from droppable container.
CLOUDSTACK-537: cloudstack UI - Advanced SG-Enabled zone - zone wizard - physical network step - remove public traffic from droppable container.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/7d89d928
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/7d89d928
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/7d89d928
Branch: refs/heads/api_refactoring
Commit: 7d89d928d9799bed968568002901e6ee34d7135d
Parents: 759d434
Author: Jessica Wang <je...@citrix.com>
Authored: Mon Nov 26 12:45:47 2012 -0800
Committer: Jessica Wang <je...@citrix.com>
Committed: Mon Nov 26 12:45:47 2012 -0800
----------------------------------------------------------------------
ui/scripts/zoneWizard.js | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7d89d928/ui/scripts/zoneWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
index af29da5..c43a747 100755
--- a/ui/scripts/zoneWizard.js
+++ b/ui/scripts/zoneWizard.js
@@ -75,7 +75,7 @@
];
}
}
- else if (args.data.zone.networkType == 'Advanced') {
+ else { // args.data.zone.networkType == 'Advanced'
if(args.data.zone.sgEnabled != true) {
return [
'management',
@@ -93,15 +93,20 @@
},
disabledTrafficTypes: function(args) {
- if (args.data.zone.networkType == 'Basic' && (selectedNetworkOfferingHavingEIP ||
- selectedNetworkOfferingHavingELB)) {
- return [];
- } else if (args.data.zone.networkType == 'Basic') {
- return ['public'];
- } else {
- return [];
+ if (args.data.zone.networkType == 'Basic') {
+ if(selectedNetworkOfferingHavingEIP || selectedNetworkOfferingHavingELB)
+ return [];
+ else
+ return ['public'];
+ }
+ else { // args.data.zone.networkType == 'Advanced'
+ if(args.data.zone.sgEnabled != true) {
+ return [];
+ }
+ else {
+ return ['public'];
+ }
}
-
},
cloneTrafficTypes: function(args) {