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/4.2 to dabc071
Date Mon, 19 Aug 2013 18:38:06 GMT
Updated Branches:
  refs/heads/4.2 f7eeb194c -> dabc071a1


CLOUDSTACK-3464: UI > VPC > Router > Public IP Addresses > detailView - fix associated
network name.


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

Branch: refs/heads/4.2
Commit: dabc071a16aa0e0fa6ab086d9e57719c0d964f32
Parents: f7eeb19
Author: Jessica Wang <jessicawang@apache.org>
Authored: Mon Aug 19 11:34:40 2013 -0700
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Mon Aug 19 11:36:57 2013 -0700

----------------------------------------------------------------------
 ui/scripts/network.js | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dabc071a/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 568c0a5..5c57cc4 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -2575,10 +2575,10 @@
                                     },
                                     associatednetworkid: {
                                         label: 'label.associated.network.id'
-                                    },
-                                    networkname: {
-                                        label: 'label.associated.network'
-                                    },
+                                    },                                    
+                                    associatednetworkname: {
+                                        label: 'label.network.name'
+                                    },   
                                     state: {
                                         label: 'label.state'
                                     },
@@ -2645,9 +2645,7 @@
 
                                             args.response.success({
                                                 actionFilter: actionFilters.ipAddress,
-                                                data: $.extend(ipObj, {
-                                                    networkname: network ? network.name :
''
-                                                })
+                                                data: ipObj
                                             });
                                         },
                                         error: function(data) {


Mime
View raw message