UI - modules - replace addExtraPropertiesIfDrModuleIncluded() with cloudStack.dr.sharedFunctions.addExtraProperties().

Jessica Wang · Jessica Wang · commit 3a3a3902b79c · 2014-06-13T16:44:15.000-07:00
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
@@ -1877,9 +1877,10 @@
                                         else
                                             jsonObj.xenserverToolsVersion61plus = false;
                                     }
-                                    
-                                    //if DR module is included                                   
-                                    addExtraPropertiesIfDrModuleIncluded(jsonObj, "UserVM");
+                                                                       
+                                    if (isModuleIncluded("dr")) {
+                                        cloudStack.dr.sharedFunctions.addExtraProperties(jsonObj, "UserVM");
+                                    }                                    
                                                                         
                                     args.response.success({
                                         actionFilter: vmActionfilter,
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
@@ -1383,10 +1383,11 @@
                                         success: function(json) {
                                             var jsonObj = json.listnetworksresponse.network[0];
                                             addExtraPropertiesToGuestNetworkObject(jsonObj);
-                                                                                        
-                                            //if DR module is included                                   
-                                            addExtraPropertiesIfDrModuleIncluded(jsonObj, "Network");                                                            
-                                                                                        
+                                             
+                                            if (isModuleIncluded("dr")) {
+                                                cloudStack.dr.sharedFunctions.addExtraProperties(jsonObj, "Network"); 
+                                            }
+                                                                                     
                                             args.response.success({
                                                 actionFilter: cloudStack.actionFilter.guestNetwork,
                                                 data: jsonObj
diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js
@@ -1173,32 +1173,6 @@ function listViewDataProvider(args, data, options) {
     return data;
 }
 
-var addExtraPropertiesIfDrModuleIncluded = function(jsonObj, resourceType) {      
-    if (isModuleIncluded("dr")) {
-        $.ajax({
-            url: createURL("listResourceDetails"),
-            data: {
-                resourceid: jsonObj.id,
-                resourcetype: resourceType
-            },
-            async: false,
-            success: function(json) {    
-                var drFieldNameArray = [];
-                var resourcedetails = json.listresourcedetailsresponse.resourcedetail;
-                if (resourcedetails != undefined) {
-                    for (var i = 0; i < resourcedetails.length; i++) {                                                        
-                        if (resourcedetails[i].key.indexOf("DR_") > -1) {     
-                            drFieldNameArray.push(resourcedetails[i].key);
-                            jsonObj[resourcedetails[i].key] = resourcedetails[i].value;                                                                                                                   
-                        }
-                    }
-                }                  
-                jsonObj["drFieldNameArray"] = drFieldNameArray;
-            }
-        });
-    }    
-}
-
 //used by infrastructure page and network page
 var addExtraPropertiesToGuestNetworkObject = function(jsonObj) {
     jsonObj.networkdomaintext = jsonObj.networkdomain;
diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js
@@ -1502,8 +1502,9 @@
                                         success: function(json) {
                                             var jsonObj = json.listvolumesresponse.volume[0];
                                             
-                                            //if DR module is included                                   
-                                            addExtraPropertiesIfDrModuleIncluded(jsonObj, "Volume");
+                                            if (isModuleIncluded("dr")) {
+                                                cloudStack.dr.sharedFunctions.addExtraProperties(jsonObj, "Volume");
+                                            }                                            
                                             
                                             args.response.success({
                                                 actionFilter: volumeActionfilter,
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
@@ -1955,8 +1955,9 @@
                                                             selectedGuestNetworkObj = json.listnetworksresponse.network[0];
                                                             addExtraPropertiesToGuestNetworkObject(selectedGuestNetworkObj);
                                                                                                                         
-                                                            //if DR module is included                                   
-                                                            addExtraPropertiesIfDrModuleIncluded(selectedGuestNetworkObj, "Network");                                                            
+                                                            if (isModuleIncluded("dr")) {
+                                                                cloudStack.dr.sharedFunctions.addExtraProperties(selectedGuestNetworkObj, "Network");  
+                                                            }
                                                             
                                                             args.response.success({
                                                                 actionFilter: cloudStack.actionFilter.guestNetwork,
@@ -7595,8 +7596,9 @@
                                                         //override default error handling: cloudStack.dialog.notice({ message: parseXMLHttpResponse(XMLHttpResponse)});
                                                     });
                                                     
-                                                    //if DR module is included                                   
-                                                    addExtraPropertiesIfDrModuleIncluded(selectedZoneObj, "Zone");
+                                                    if (isModuleIncluded("dr")) {
+                                                        cloudStack.dr.sharedFunctions.addExtraProperties(selectedZoneObj, "Zone");
+                                                    }
                                                     
                                                     args.response.success({
                                                         actionFilter: zoneActionfilter,
