From fed5422c101ee4361dfce86929cb2fe917503d5c Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessicawang@apache.org>
Date: Thu, 23 Oct 2014 12:09:43 -0700
Subject: [PATCH] CLOUDSTACK-7777: UI > storage > volume > attach disk >
 virtual machine dropdown > remove unnecessary module check.

---
 ui/scripts/storage.js | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js
index ee8fa9d711c..c9ecc1da8e5 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
-                                                                    });
-                                                                }                                                                
+                                                                });                                                                                                                                
                                                             });
                                                         }
                                                     });