cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jessicaw...@apache.org
Subject git commit: updated refs/heads/master to 044c5e0
Date Mon, 09 Jun 2014 18:43:34 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master a8212d9ef -> 044c5e0ee


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


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/044c5e0e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/044c5e0e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/044c5e0e

Branch: refs/heads/master
Commit: 044c5e0eeef3211a4418c1251f23f1e91499316e
Parents: a8212d9
Author: Jessica Wang <jessicawang@apache.org>
Authored: Mon Jun 9 11:38:34 2014 -0700
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Mon Jun 9 11:43:20 2014 -0700

----------------------------------------------------------------------
 ui/scripts/network.js | 4 ++++
 ui/scripts/storage.js | 4 ++++
 ui/scripts/system.js  | 7 +++++++
 3 files changed, 15 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/044c5e0e/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 9d5fb79..4772c34 100755
--- 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

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/044c5e0e/ui/scripts/storage.js
----------------------------------------------------------------------
diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js
index 6f35452..45890b0 100644
--- 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

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/044c5e0e/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index a74bc70..7e3b457 100644
--- 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


Mime
View raw message