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

CLOUDSTACK-7777: UI > storage > volume > attach disk > virtual machine dropdown > remove unnecessary module check.

Browse Source
This commit is contained in:
Jessica Wang 2014-10-23 12:09:43 -07:00
parent 4e1284147e
commit fed5422c10
1 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ui/scripts/storage.js
View File

@ -904,11 +904,6 @@
hypervisor: args.context.volumes[0].hypervisor hypervisor: args.context.volumes[0].hypervisor
}); });
} }
var volumeDrEnabled = false;
if (isModuleIncluded("dr")) {
volumeDrEnabled = cloudStack.dr.sharedFunctions.isVolumeDrEnabled(args.context.volumes[0]);
}
$(['Running', 'Stopped']).each(function() { $(['Running', 'Stopped']).each(function() {
$.ajax({ $.ajax({
@ -919,21 +914,11 @@
async: false, async: false,
success: function(json) { success: function(json) {
var instanceObjs = json.listvirtualmachinesresponse.virtualmachine; var instanceObjs = json.listvirtualmachinesresponse.virtualmachine;
$(instanceObjs).each(function() { $(instanceObjs).each(function() {
if (isModuleIncluded("dr")) {
var vmDrEnabled = cloudStack.dr.sharedFunctions.isVmDrEnabled(this);
if (vmDrEnabled == volumeDrEnabled) {
items.push({ items.push({
id: this.id, id: this.id,
description: this.displayname ? this.displayname : this.name description: this.displayname ? this.displayname : this.name
}); });
}
} else {
items.push({
id: this.id,
description: this.displayname ? this.displayname : this.name
});
}
}); });
} }
}); });