diff --git a/ui/jsp/instance.jsp b/ui/jsp/instance.jsp index f79a25d4f15..c8f15727629 100644 --- a/ui/jsp/instance.jsp +++ b/ui/jsp/instance.jsp @@ -1496,7 +1496,7 @@
  1. - + diff --git a/ui/scripts/cloud.core.init.js b/ui/scripts/cloud.core.init.js index 747cc840e15..711088518f1 100644 --- a/ui/scripts/cloud.core.init.js +++ b/ui/scripts/cloud.core.init.js @@ -309,7 +309,7 @@ $(document).ready(function() { success: function(json) { var zones = json.listzonesresponse.zone; zoneSelect.empty(); - zoneSelect.append(""); + zoneSelect.append(""); if (zones != null && zones.length > 0) { for (var i = 0; i < zones.length; i++) { zoneSelect.append(""); @@ -336,7 +336,8 @@ $(document).ready(function() { async: false, success: function(json) { var pods = json.listpodsresponse.pod; - podSelect.empty(); + podSelect.empty(); + podSelect.append(""); if (pods != null && pods.length > 0) { for (var i = 0; i < pods.length; i++) { podSelect.append(""); @@ -353,13 +354,14 @@ $(document).ready(function() { } var domainSelect = $advancedSearchPopup.find("#adv_search_domain"); - if(domainSelect.length>0 && $advancedSearchPopup.find("#adv_search_domain_li").css("display")!="none") { - var domainSelect = domainSelect.empty(); + if(domainSelect.length>0 && $advancedSearchPopup.find("#adv_search_domain_li").css("display")!="none") { $.ajax({ data: createURL("command=listDomains&available=true"), dataType: "json", success: function(json) { - var domains = json.listdomainsresponse.domain; + var domains = json.listdomainsresponse.domain; + domainSelect.empty(); + domainSelect.append(""); if (domains != null && domains.length > 0) { for (var i = 0; i < domains.length; i++) { domainSelect.append(""); @@ -368,16 +370,17 @@ $(document).ready(function() { } }); } - + + /* var vmSelect = $advancedSearchPopup.find("#adv_search_vm"); - if(vmSelect.length>0) { - vmSelect.empty(); - vmSelect.append(""); + if(vmSelect.length>0) { $.ajax({ data: createURL("command=listVirtualMachines"), dataType: "json", success: function(json) { - var items = json.listvirtualmachinesresponse.virtualmachine; + var items = json.listvirtualmachinesresponse.virtualmachine; + vmSelect.empty(); + vmSelect.append(""); if (items != null && items.length > 0) { for (var i = 0; i < items.length; i++) { vmSelect.append(""); @@ -386,6 +389,7 @@ $(document).ready(function() { } }); } + */ $advancedSearchPopup.find("#adv_search_startdate, #adv_search_enddate").datepicker({dateFormat: 'yy-mm-dd'}); }