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

CLOUDSTACK-1840: cloudstack UI - VM Wizard - fix a bug that the first parameter in jQuery.grep() should not be null.

This commit is contained in:
Jessica Wang 2013-03-28 16:23:05 -07:00
parent e3f67d126d
commit 4534dafba1
1 changed files with 45 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
ui/scripts/instanceWizard.js
View File

@ -128,10 +128,15 @@
dataType: "json",
async: false,
success: function(json) {
featuredTemplateObjs = $.grep(json.listtemplatesresponse.template, function(item, index) {
if($.inArray(item.hypervisor, hypervisorArray) > -1)
return true;
});
if(json.listtemplatesresponse.template == null) {
featuredTemplateObjs = null;
}
else {
featuredTemplateObjs = $.grep(json.listtemplatesresponse.template, function(item, index) {
if($.inArray(item.hypervisor, hypervisorArray) > -1)
return true;
});
}
}
});
$.ajax({
@ -139,10 +144,15 @@
dataType: "json",
async: false,
success: function(json) {
communityTemplateObjs = $.grep(json.listtemplatesresponse.template, function(item, index) {
if($.inArray(item.hypervisor, hypervisorArray) > -1)
return true;
});
if(json.listtemplatesresponse.template == null) {
communityTemplateObjs = null;
}
else {
communityTemplateObjs = $.grep(json.listtemplatesresponse.template, function(item, index) {
if($.inArray(item.hypervisor, hypervisorArray) > -1)
return true;
});
}
}
});
$.ajax({
@ -150,10 +160,15 @@
dataType: "json",
async: false,
success: function(json) {
myTemplateObjs = $.grep(json.listtemplatesresponse.template, function(item, index) {
if($.inArray(item.hypervisor, hypervisorArray) > -1)
return true;
});
if(json.listtemplatesresponse.template == null) {
myTemplateObjs = null;
}
else {
myTemplateObjs = $.grep(json.listtemplatesresponse.template, function(item, index) {
if($.inArray(item.hypervisor, hypervisorArray) > -1)
return true;
});
}
}
});
} else if (selectedTemplate == 'select-iso') {
@ -162,7 +177,12 @@
dataType: "json",
async: false,
success: function(json) {
featuredIsoObjs = json.listisosresponse.iso;
if(json.listisosresponse.iso == null) {
featuredIsoObjs = null;
}
else {
featuredIsoObjs = json.listisosresponse.iso;
}
}
});
$.ajax({
@ -170,7 +190,12 @@
dataType: "json",
async: false,
success: function(json) {
communityIsoObjs = json.listisosresponse.iso;
if(json.listisosresponse.iso == null) {
communityIsoObjs = null;
}
else {
communityIsoObjs = json.listisosresponse.iso;
}
}
});
$.ajax({
@ -178,7 +203,12 @@
dataType: "json",
async: false,
success: function(json) {
myIsoObjs = json.listisosresponse.iso;
if(json.listisosresponse.iso == null) {
myIsoObjs = null;
}
else {
myIsoObjs = json.listisosresponse.iso;
}
}
});
}