Updated Branches: refs/heads/4.1 77d3aa34d -> 2ea359c5d
CLOUDSTACK-1251: cloudstack UI - 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) Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/2ea359c5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/2ea359c5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/2ea359c5 Branch: refs/heads/4.1 Commit: 2ea359c5de4bda7c62fd5e891325a51688113086 Parents: 77d3aa3 Author: Jessica Wang <[email protected]> Authored: Wed Feb 13 11:16:08 2013 -0800 Committer: Jessica Wang <[email protected]> Committed: Wed Feb 13 11:16:08 2013 -0800 ---------------------------------------------------------------------- ui/scripts/ui-custom/zoneWizard.js | 13 ++++++++++++- ui/scripts/zoneWizard.js | 14 +++++++++++--- 2 files changed, 23 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2ea359c5/ui/scripts/ui-custom/zoneWizard.js ---------------------------------------------------------------------- diff --git a/ui/scripts/ui-custom/zoneWizard.js b/ui/scripts/ui-custom/zoneWizard.js index 47fa385..718b454 100644 --- a/ui/scripts/ui-custom/zoneWizard.js +++ b/ui/scripts/ui-custom/zoneWizard.js @@ -1210,7 +1210,18 @@ if (($form && $form.find('.error:visible').size()) || !isCustomValidated) 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()) showStep($steps.filter(':visible').index() + 2); else { http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2ea359c5/ui/scripts/zoneWizard.js ---------------------------------------------------------------------- diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js index 7677c15..60656e0 100755 --- a/ui/scripts/zoneWizard.js +++ b/ui/scripts/zoneWizard.js @@ -2735,9 +2735,17 @@ dataType: "json", success: function(json) { 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) { var errorMsg = parseXMLHttpResponse(XMLHttpResponse);
