CLOUDSTACK-6852: UI - modules - add DR fields to volume detailView, network detailView, zone detailView.

Jessica Wang · Jessica Wang · commit 044c5e0eeef3 · 2014-06-09T11:43:20.000-07:00
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
@@ -1383,6 +1383,10 @@
                                         success: function(json) {
                                             var jsonObj = json.listnetworksresponse.network[0];
                                             addExtraPropertiesToGuestNetworkObject(jsonObj);
+                                                                                        
+                                            //if DR module is included                                   
+                                            addExtraPropertiesIfDrModuleIncluded(jsonObj, "Network");                                                            
+                                                                                        
                                             args.response.success({
                                                 actionFilter: cloudStack.actionFilter.guestNetwork,
                                                 data: jsonObj
diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js
@@ -1497,6 +1497,10 @@
                                         async: true,
                                         success: function(json) {
                                             var jsonObj = json.listvolumesresponse.volume[0];
+                                            
+                                            //if DR module is included                                   
+                                            addExtraPropertiesIfDrModuleIncluded(jsonObj, "Volume");
+                                            
                                             args.response.success({
                                                 actionFilter: volumeActionfilter,
                                                 data: jsonObj
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
@@ -1954,6 +1954,10 @@
                                                         success: function (json) {
                                                             selectedGuestNetworkObj = json.listnetworksresponse.network[0];
                                                             addExtraPropertiesToGuestNetworkObject(selectedGuestNetworkObj);
+                                                                                                                        
+                                                            //if DR module is included                                   
+                                                            addExtraPropertiesIfDrModuleIncluded(selectedGuestNetworkObj, "Network");                                                            
+                                                            
                                                             args.response.success({
                                                                 actionFilter: cloudStack.actionFilter.guestNetwork,
                                                                 data: selectedGuestNetworkObj
@@ -7591,6 +7595,9 @@
                                                         //override default error handling: cloudStack.dialog.notice({ message: parseXMLHttpResponse(XMLHttpResponse)});
                                                     });
                                                     
+                                                    //if DR module is included                                   
+                                                    addExtraPropertiesIfDrModuleIncluded(selectedZoneObj, "Zone");
+                                                    
                                                     args.response.success({
                                                         actionFilter: zoneActionfilter,
                                                         data: selectedZoneObj
