From fb9c62ff1c6206357aaeac74ea924e4ccfd3057a Mon Sep 17 00:00:00 2001
From: Pranav Saxena <pranav.saxena@citrix.com>
Date: Thu, 29 Nov 2012 00:32:18 +0530
Subject: [PATCH] CLOUDSTACK-555:Uncaught TypeError: Cannot read property 0 of
 undefined in UI while navigating to ipAddresses section under VPC

---
 ui/scripts/network.js | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 9e292a5c61f..ee75a8e624b 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -1263,11 +1263,21 @@
               addRow: 'true',
               preFilter: function(args) {                
 								var zoneObj;
+                                                                var dataObj = {};
+                                                                if('vpc' in args.context) { //from VPC section
+                                                                $.extend(dataObj, {
+                                                                  vpcid: args.context.vpc[0].id
+                                                                   });
+                                                                 }
+                                                               else if('networks' in args.context) { //from Guest Network section
+                                                                  $.extend(dataObj, {
+                                                                  networkid: args.context.networks[0].id
+                                                                   });
+                                                                 }
+
 								$.ajax({
 								  url: createURL('listZones'),
-									data: {
-									  id: args.context.networks[0].zoneid
-									},
+									data: dataObj,
 									async: false,
 									success: function(json) {									  
 										zoneObj = json.listzonesresponse.zone[0];