From dabc071a16aa0e0fa6ab086d9e57719c0d964f32 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessicawang@apache.org>
Date: Mon, 19 Aug 2013 11:34:40 -0700
Subject: [PATCH] CLOUDSTACK-3464: UI > VPC > Router > Public IP Addresses >
 detailView - fix associated network name.

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

diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 568c0a5ec13..5c57cc42207 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) {