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

bug 13461: deployVM wizard - select ISO step - fix a bug that hypervisor div didn't get removed if ISO in another tab is selected (select ISO step has 3 tabs now).

This commit is contained in:
Jessica Wang 2012-02-08 20:22:22 -08:00
parent 2756b0fdcc
commit 5c7789f1fb
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ui/scripts/instances.js
View File

@ -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),

7
ui/scripts/ui-custom/instanceWizard.js
View File

@ -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(
$('<div>').addClass('hypervisor')
.append($('<label>').html('Hypervisor:'))