From 8a008ecd1633d706e5d4a4c2a7f3ae8e5374bd38 Mon Sep 17 00:00:00 2001
From: Mice Xia <mice_xia@tcloudcomputing.com>
Date: Thu, 13 Sep 2012 10:51:39 +0800
Subject: [PATCH] CLOUDSTACK-82 enable static nat button is not working in UI

---
 ui/scripts/network.js | 41 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index d0f65c4c3c0..3bb39225279 100644
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -1430,34 +1430,33 @@
                       listView: {
                         filters: false,
                         dataProvider: function(args) {
-                          var $listView = args.$listView;
                           var data = {
                             page: args.page,
                             pageSize: pageSize,                            
                             listAll: true
                           };
-
-                          // See if tier is selected
-                          var $tierSelect = $listView.find('.tier-select select');
                           
-                          if ($tierSelect.size() && $tierSelect.val() != '-1') {
-                            data.networkid = $tierSelect.val();
+                          var $tierSelect = $(".ui-dialog-content").find('.tier-select select');
+                          
+                          // if $tierSelect is not initialized, return; tierSelect() will refresh listView and come back here later 
+                          if($tierSelect.size() == 0){
+                            args.response.success({ data: null });
+                            return;             
+                          }
+                          
+                          if('vpc' in args.context) {
+                            if($tierSelect.size() && $tierSelect.val() != '-1' ){ 
+                              data.networkid = $tierSelect.val();
+                            }                          
+                            $.extend(data, {
+                              vpcid: args.context.vpc[0].id
+                            });
+                          }
+                          else if('networks' in args.context) {
+                            $.extend(data, {
+                              networkid: args.context.networks[0].id
+                            });
                           }
-													else {
-													  args.response.success({ data: null });
-														return;
-													}
-
-													if('vpc' in args.context) {
-													  $.extend(data, {
-														  vpcid: args.context.vpc[0].id
-														});
-													}
-													else if('networks' in args.context) {
-													  $.extend(data, {
-														  networkid: args.context.networks[0].id
-														});
-													}
 													
                           if (!args.context.projects) {
                             $.extend(data, {