CLOUDSTACK-6852: UI - modules - (1) add new shared function addExtraPropertiesIfDrModuleIncluded(). (2) add DR fields to Instances detailView.

Jessica Wang · Jessica Wang · commit 36ec16e4f51a · 2014-06-06T15:18:46.000-07:00
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
@@ -1878,6 +1878,9 @@
                                             jsonObj.xenserverToolsVersion61plus = false;
                                     }
                                     
+                                    //if DR module is included                                   
+                                    addExtraPropertiesIfDrModuleIncluded(jsonObj, "UserVM");
+                                                                        
                                     args.response.success({
                                         actionFilter: vmActionfilter,
                                         data: jsonObj
diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js
@@ -1175,6 +1175,32 @@ function listViewDataProvider(args, data, options) {
     return data;
 }
 
+var addExtraPropertiesIfDrModuleIncluded = function(jsonObj, resourceType) {      
+    if (drModuleIncluded) {
+        $.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;

Original file line number	Diff line number	Diff line change
`@@ -1878,6 +1878,9 @@`
`1878`	`1878`	`jsonObj.xenserverToolsVersion61plus = false;`
`1879`	`1879`	`}`
`1880`	`1880`
	`1881`	`+ //if DR module is included`
	`1882`	`+ addExtraPropertiesIfDrModuleIncluded(jsonObj, "UserVM");`
	`1883`	`+`
`1881`	`1884`	`args.response.success({`
`1882`	`1885`	`actionFilter: vmActionfilter,`
`1883`	`1886`	`data: jsonObj`