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 41fb3e8
Date Tue, 28 Oct 2014 18:30:29 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 609951ffe -> 41fb3e857


CLOUDSTACK-7796: UI > network > detail view > data provider > remove unnecessary
module check.


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

Branch: refs/heads/master
Commit: 41fb3e857942737c198fbabcde0f618f42a0f80d
Parents: 609951f
Author: Jessica Wang <jessicawang@apache.org>
Authored: Tue Oct 28 11:25:56 2014 -0700
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Tue Oct 28 11:30:14 2014 -0700

----------------------------------------------------------------------
 ui/scripts/network.js | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/41fb3e85/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index d011083..2047ecd 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -1385,12 +1385,7 @@
                                         async: true,
                                         success: function(json) {
                                             var jsonObj = json.listnetworksresponse.network[0];
-                                            addExtraPropertiesToGuestNetworkObject(jsonObj);
-                                             
-                                            if (isModuleIncluded("dr")) {
-                                                cloudStack.dr.sharedFunctions.addExtraProperties(jsonObj,
"Network"); 
-                                            }
-                                                                                     
+                                            addExtraPropertiesToGuestNetworkObject(jsonObj);
                                                                              
                                             args.response.success({
                                                 actionFilter: cloudStack.actionFilter.guestNetwork,
                                                 data: jsonObj


Mime
View raw message