etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 13313: new zone wizard - skip addHost step if cluster is VMware.

This commit is contained in:
Jessica Wang 2012-01-25 11:40:37 -08:00
parent 029ba147f7
commit d569f383f9
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/index.jsp
View File

@ -627,7 +627,7 @@
<!-- Step 4.2: Add host -->
<div class="add-cluster" zone-wizard-form="host"
zone-wizard-step-id="addHost">
zone-wizard-step-id="addHost" zone-wizard-prefilter="addHost">
<ul class="subnav">
<li class="cluster">Cluster</li>
<li class="host active">Host</li>

27
ui/scripts/zoneWizard.js
View File

@ -88,7 +88,11 @@
$.grep(args.groupedData.physicalNetworks, function(network) {
return $.inArray('guest', network.trafficTypes) > -1;
}).length;
}
},
addHost: function(args) {
return (args.groupedData.cluster.hypervisor != "VMware");
}
},
forms: {
@ -2033,12 +2037,21 @@
url: createURL("addCluster" + array1.join("")),
dataType: "json",
async: true,
success: function(json) {
stepFns.addHost({
data: $.extend(args.data, {
returnedCluster: json.addclusterresponse.cluster[0]
})
});
success: function(json) {
if(args.groupedData.cluster.hypervisor != "VMware") {
stepFns.addHost({
data: $.extend(args.data, {
returnedCluster: json.addclusterresponse.cluster[0]
})
});
}
else { //args.groupedData.cluster.hypervisor == "VMware", skip add host step
stepFns.addPrimaryStorage({
data: $.extend(args.data, {
returnedCluster: json.addclusterresponse.cluster[0]
})
});
}
},
error: function(XMLHttpResponse) {
var errorMsg = parseXMLHttpResponse(XMLHttpResponse);