You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by wi...@apache.org on 2013/02/14 20:57:51 UTC
[22/50] [abbrv] git commit: refs/heads/qemu-img - CLOUDSTACK-1251:
cloudstack UI - zBaremetal - zone wizard - when hypervisor is BareMetal,
click Next button in Guest Traffic step will finish the whole process.
CLOUDSTACK-1251: cloudstack UI - zBaremetal - zone wizard - when hypervisor is BareMetal, click Next button in Guest Traffic step will finish the whole process.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/ceb44aca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/ceb44aca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/ceb44aca
Branch: refs/heads/qemu-img
Commit: ceb44aca30ff4fb944e48ea08dc455d2bd0fb7b8
Parents: 4b7dbbe
Author: Jessica Wang <je...@citrix.com>
Authored: Wed Feb 13 11:55:05 2013 -0800
Committer: Jessica Wang <je...@citrix.com>
Committed: Wed Feb 13 11:55:05 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/ceb44aca/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/ceb44aca/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);