apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 20:02:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Forgot to add listing of templates by hypervisor

Browse Source
This commit is contained in:
will 2010-09-16 18:15:43 -07:00 committed by edison
parent 67cc587603
commit 3570322ef5
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ui/scripts/cloud.core.instances.js
View File

@ -1411,21 +1411,25 @@ function showInstancesTab(p_domainId, p_account) {
var zoneId = vmPopup.find("#wizard_zone").val(); var zoneId = vmPopup.find("#wizard_zone").val();
if(zoneId == null || zoneId.length == 0) if(zoneId == null || zoneId.length == 0)
return; return;
var hypervisor = vmPopup.find("#wizard_hypervisor").val();
if (hypervisor == null || hypervisor.length == 0)
return;
var container = vmPopup.find("#template_container"); var container = vmPopup.find("#template_container");
var commandString; var commandString;
var searchInput = vmPopup.find("#search_input").val(); var searchInput = vmPopup.find("#search_input").val();
if (selectedTemplateTypeInVmPopup != "blank") { if (selectedTemplateTypeInVmPopup != "blank") {
if (searchInput != null && searchInput.length > 0) if (searchInput != null && searchInput.length > 0)
commandString = "command=listTemplates&templatefilter="+selectedTemplateTypeInVmPopup+"&zoneid="+zoneId+"&keyword="+searchInput+"&page="+currentPageInTemplateGridInVmPopup+"&response=json"; commandString = "command=listTemplates&templatefilter="+selectedTemplateTypeInVmPopup+"&zoneid="+zoneId+"&hypervisor="+hypervisor+"&keyword="+searchInput+"&page="+currentPageInTemplateGridInVmPopup+"&response=json";
else else
commandString = "command=listTemplates&templatefilter="+selectedTemplateTypeInVmPopup+"&zoneid="+zoneId+"&page="+currentPageInTemplateGridInVmPopup+"&response=json"; commandString = "command=listTemplates&templatefilter="+selectedTemplateTypeInVmPopup+"&zoneid="+zoneId+"&hypervisor="+hypervisor+"&page="+currentPageInTemplateGridInVmPopup+"&response=json";
} else { } else {
if (searchInput != null && searchInput.length > 0) if (searchInput != null && searchInput.length > 0)
commandString = "command=listIsos&isReady=true&bootable=true&zoneid="+zoneId+"&keyword="+searchInput+"&page="+currentPageInTemplateGridInVmPopup+"&response=json"; commandString = "command=listIsos&isReady=true&bootable=true&zoneid="+zoneId+"&hypervisor="+hypervisor+"&keyword="+searchInput+"&page="+currentPageInTemplateGridInVmPopup+"&response=json";
else else
commandString = "command=listIsos&isReady=true&bootable=true&zoneid="+zoneId+"&page="+currentPageInTemplateGridInVmPopup+"&response=json"; commandString = "command=listIsos&isReady=true&bootable=true&zoneid="+zoneId+"&hypervisor="+hypervisor+"&page="+currentPageInTemplateGridInVmPopup+"&response=json";
} }
var loading = vmPopup.find("#wiz_template_loading").show(); var loading = vmPopup.find("#wiz_template_loading").show();
@ -1506,6 +1510,13 @@ function showInstancesTab(p_domainId, p_account) {
if(selectedZone != null && selectedZone.length > 0) if(selectedZone != null && selectedZone.length > 0)
listTemplatesInVmPopup(); listTemplatesInVmPopup();
return false; return false;
});
vmPopup.find("#wizard_hypervisor").bind("change", function(event) {
var selectedHypervisor = $(this).val();
if(selectedHypervisor != null && selectedHypervisor.length > 0)
listTemplatesInVmPopup();
return false;
}); });
function displayDiskOffering(type) { function displayDiskOffering(type) {
@ -1633,7 +1644,6 @@ function showInstancesTab(p_domainId, p_account) {
// Create a new VM!!!! // Create a new VM!!!!
var moreCriteria = []; var moreCriteria = [];
moreCriteria.push("&zoneId="+thisPopup.find("#wizard_zone").val()); moreCriteria.push("&zoneId="+thisPopup.find("#wizard_zone").val());
moreCriteria.push("&hypervisor="+thisPopup.find("#wizard_hypervisor").val());
var name = trim(thisPopup.find("#wizard_vm_name").val()); var name = trim(thisPopup.find("#wizard_vm_name").val());
if (name != null && name.length > 0) if (name != null && name.length > 0)