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

Merge release branch 4.13 to master 

* 4.13:
  UI bug fix: Cannot deploy VM from ISO (#3995)
This commit is contained in:
Daan Hoogland 2020-03-30 20:09:15 +00:00
parent 66f5ecf908 95f58dbbdc
commit ef14e195c4
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ui/scripts/instanceWizard.js
View File

@ -965,14 +965,16 @@
}
});
$.ajax({
url: createURL("listTemplateOvfProperties&id=" + selectedTemplateObj.id),
dataType: "json",
async: false,
success: function(json) {
ovfProps = json.listtemplateovfpropertiesresponse.ovfproperty;
}
});
if (selectedTemplateObj) {
$.ajax({
url: createURL("listTemplateOvfProperties&id=" + selectedTemplateObj.id),
dataType: "json",
async: false,
success: function(json) {
ovfProps = json.listtemplateovfpropertiesresponse.ovfproperty;
}
});
}
var $step = $('.step.sshkeyPairs:visible');
if (ovfProps == null || ovfProps.length === 0) {