apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-12-16 10:32:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-1251: cloudstack UI - zBaremetal - zone wizard - when hypervisor is BareMetal, click Next button in Guest Traffic step will finish the whole process.

Browse Source
This commit is contained in:
Jessica Wang 2013-02-13 11:55:05 -08:00
parent 4b7dbbe5cd
commit ceb44aca30
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ui/scripts/ui-custom/zoneWizard.js
View File

@ -1211,6 +1211,17 @@
return false; return false;
} }
//when hypervisor is BareMetal (begin)
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;
}
}
//when hypervisor is BareMetal (end)
if (!$target.closest('.button.next.final').size()) if (!$target.closest('.button.next.final').size())
showStep($steps.filter(':visible').index() + 2); showStep($steps.filter(':visible').index() + 2);
else { else {

14
ui/scripts/zoneWizard.js
View File

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