CLOUDSTACK-1343: cloudstack UI - baremetal - zone wizard - ask whether to 
enable the zone or not after zone creation is completed.


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

Branch: refs/heads/ui-vm-affinity
Commit: 28572345d9734117f77755b98c3a64fce4bb67e8
Parents: a1ecc73
Author: Jessica Wang <[email protected]>
Authored: Fri Apr 19 12:26:46 2013 -0700
Committer: Jessica Wang <[email protected]>
Committed: Fri Apr 19 12:27:28 2013 -0700

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/28572345/ui/scripts/zoneWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
index 6299fab..aa2c2fa 100755
--- a/ui/scripts/zoneWizard.js
+++ b/ui/scripts/zoneWizard.js
@@ -3052,16 +3052,16 @@
               success: function(json) {
                 args.data.returnedGuestNetwork.returnedVlanIpRange = 
json.createvlaniprangeresponse.vlan;
                 
-                                                               //when 
hypervisor is BareMetal (begin)                                                 
 
-                                                               
if(args.data.zone.hypervisor == "BareMetal") {
-                                                                 alert('Zone 
creation is completed. Please refresh this page.');
+                                                               
if(args.data.zone.hypervisor == "BareMetal") { //if hypervisor is BareMetal, 
zone creation is completed at this point.                                       
                                     
+                                                                       
complete({
+                                                                               
data: args.data
+                                                                       });     
                                                                
                                                                }               
                                                
                                                                else {
                                                                        
stepFns.addCluster({
                                                                                
data: args.data
                                                                        });
-                                                               }
-                                                               //when 
hypervisor is BareMetal (end)   
+                                                               }               
                                                
               },
               error: function(XMLHttpResponse) {
                 var errorMsg = parseXMLHttpResponse(XMLHttpResponse);

Reply via email to