cloudstack - zBaremetal branch - add zone wizard - when hypervisor is BareMetal, click Next button in Guest Traffic step will finish the whole process. (for Frank's development)

This commit is contained in:
Jessica Wang 2012-05-22 11:15:06 -07:00
parent 3de476340e
commit da20ee3c40
2 changed files with 23 additions and 4 deletions

View File

@ -1144,7 +1144,18 @@
if (($form && $form.find('.error:visible').size()) || !isCustomValidated)
return false;
}
//???
var data = getData($wizard);
if(('zone' in data) && (data.zone.hypervisor == 'BareMetal')) {
if($('.zone-wizard:visible').find('#add_zone_guest_traffic_desc:visible').size() > 0) { //$steps.filter(':visible').index() == 6
showStep('launch');
completeAction();
return false;
}
}
//???
if (!$target.closest('.button.next.final').size())
showStep($steps.filter(':visible').index() + 2);
else {

View File

@ -2398,9 +2398,17 @@
dataType: "json",
success: function(json) {
args.data.returnedGuestNetwork.returnedVlanIpRange = json.createvlaniprangeresponse.vlan;
stepFns.addCluster({
data: args.data
});
//???
if(args.data.cluster.hypervisor == "BareMetal") {
alert('Frank, zone creation is done. Please refresh this page.');
}
else {
stepFns.addCluster({
data: args.data
});
}
//???
},
error: function(XMLHttpResponse) {
var errorMsg = parseXMLHttpResponse(XMLHttpResponse);