diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js index 66a5e8aee4d..153a1c78ede 100644 --- a/ui/scripts/instances.js +++ b/ui/scripts/instances.js @@ -91,7 +91,6 @@ featuredTemplateObjs = json.listtemplatesresponse.template; } }); - $.ajax({ url: createURL("listTemplates&templatefilter=community&zoneid="+args.currentData.zoneid), dataType: "json", @@ -100,7 +99,6 @@ communityTemplateObjs = json.listtemplatesresponse.template; } }); - $.ajax({ url: createURL("listTemplates&templatefilter=selfexecutable&zoneid="+args.currentData.zoneid), dataType: "json", @@ -110,8 +108,8 @@ } }); - //??? - $.ajax({ + + $.ajax({ url: createURL("listIsos&isofilter=featured&zoneid="+args.currentData.zoneid), dataType: "json", async: false, @@ -119,7 +117,6 @@ featuredIsoObjs = json.listisosresponse.iso; } }); - $.ajax({ url: createURL("listIsos&isofilter=community&zoneid="+args.currentData.zoneid), dataType: "json", @@ -128,7 +125,6 @@ communityIsoObjs = json.listisosresponse.iso; } }); - $.ajax({ url: createURL("listIsos&isofilter=selfexecutable&zoneid="+args.currentData.zoneid), dataType: "json", @@ -136,9 +132,7 @@ success: function(json) { myIsoObjs = json.listisosresponse.iso; } - }); - //??? - + }); /* $.ajax({ url: createURL("listIsos&isReady=true&bootable=true&isofilter=executable&zoneid="+args.currentData.zoneid), diff --git a/ui/scripts/ui-custom/instanceWizard.js b/ui/scripts/ui-custom/instanceWizard.js index 49943f3044c..30f11ec40a3 100644 --- a/ui/scripts/ui-custom/instanceWizard.js +++ b/ui/scripts/ui-custom/instanceWizard.js @@ -222,7 +222,12 @@ // Create hypervisor select $selects.find('input').bind('click', function() { var $select = $(this).closest('.select'); - $select.siblings().removeClass('selected').find('.hypervisor').remove(); + + //$select.siblings().removeClass('selected').find('.hypervisor').remove(); //SelectISO has 3 tabs now. This line only remove hypervisor div in the same tab, not enough. The following 3 lines will remove hypervisor div in all of 3 tabs. + $("#instance-wizard-featured-isos .select-container div.selected").removeClass('selected').find('div.hypervisor').remove(); + $("#instance-wizard-community-isos .select-container div.selected").removeClass('selected').find('div.hypervisor').remove(); + $("#instance-wizard-my-isos .select-container div.selected").removeClass('selected').find('div.hypervisor').remove(); + $select.addClass('selected').append( $('