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

CS-14905: volume page - Attach Disk action - Instance dropdown - (1) Populate all instances when volume's hypervisor is "None". (2) Populate only instances whose hypervisor matches this volume's hypervisor when volume's hypervisor is not "None".

This commit is contained in:
Jessica Wang 2012-05-16 14:25:05 -07:00
parent 10d9e57115
commit ba2eb092b4
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ui/scripts/storage.js
View File

@ -33,7 +33,7 @@
fields: {
name: { label: 'label.name' },
type: { label: 'label.type' },
storagetype: { label: 'label.storage.type' },
hypervisor: { label: 'label.hypervisor' },
vmdisplayname: { label: 'label.vm.display.name' },
state: {
label: 'State',
@ -597,13 +597,18 @@
projectid: args.context.projects[0].id
};
}
if(args.context.volumes[0].hypervisor != null && args.context.volumes[0].hypervisor.length > 0 && args.context.volumes[0].hypervisor != 'None') {
data = $.extend(data, {
hypervisor: args.context.volumes[0].hypervisor
});
}
$(['Running', 'Stopped']).each(function() {
$.ajax({
url: createURL('listVirtualMachines'),
data: $.extend(data, {
state: this.toString(),
hypervisor: args.context.volumes[0].hypervisor
state: this.toString()
}),
async: false,
success: function(json) {
@ -931,7 +936,8 @@
zonename: { label: 'label.zone' },
state: { label: 'label.state' },
type: { label: 'label.type' },
storagetype: { label: 'label.storage.type' },
storagetype: { label: 'label.storage.type' },
hypervisor: { label: 'label.hypervisor' },
size : {
label: 'Size ',
converter: function(args) {