Repository: cloudstack Updated Branches: refs/heads/4.5 c52e14730 -> 000f8b163
CLOUDSTACK-7777: UI > storage > volume > attach disk > virtual machine dropdown > remove unnecessary module check. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/000f8b16 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/000f8b16 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/000f8b16 Branch: refs/heads/4.5 Commit: 000f8b163920a77b97cd5099f09225c49660c8c8 Parents: c52e147 Author: Jessica Wang <jessicaw...@apache.org> Authored: Thu Oct 23 12:09:43 2014 -0700 Committer: Jessica Wang <jessicaw...@apache.org> Committed: Thu Oct 23 14:15:01 2014 -0700 ---------------------------------------------------------------------- ui/scripts/storage.js | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/000f8b16/ui/scripts/storage.js ---------------------------------------------------------------------- diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js index ee8fa9d..c9ecc1d 100644 --- a/ui/scripts/storage.js +++ b/ui/scripts/storage.js @@ -904,11 +904,6 @@ 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() { $.ajax({ @@ -919,21 +914,11 @@ async: false, success: function(json) { var instanceObjs = json.listvirtualmachinesresponse.virtualmachine; - $(instanceObjs).each(function() { - if (isModuleIncluded("dr")) { - var vmDrEnabled = cloudStack.dr.sharedFunctions.isVmDrEnabled(this); - if (vmDrEnabled == volumeDrEnabled) { + $(instanceObjs).each(function() { items.push({ id: this.id, description: this.displayname ? this.displayname : this.name - }); - } - } else { - items.push({ - id: this.id, - description: this.displayname ? this.displayname : this.name - }); - } + }); }); } });
