From 23a5cf2570df50f0e30b9bb6f307635267fa8727 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Thu, 1 Mar 2012 11:35:59 -0800
Subject: [PATCH] Network page - detail view - make API call to refresh data
 when Refresh button is clicked. [reviewed-by: Brian]

---
 ui/scripts/network.js | 52 +++++++++++++++++++++++++++++--------------
 1 file changed, 35 insertions(+), 17 deletions(-)

diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index d2126d0f11e..8589f4c989f 100644
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -275,6 +275,7 @@
               async: false,
               success: function(data) {
                 args.response.success({
+								  actionFilter: networkActionfilter,
                   data: data.listnetworksresponse.network
                 });
               },
@@ -684,23 +685,21 @@
                     account: { label: 'label.account' }
                   }
                 ],
-                dataProvider: function(args) {
-                  args.response.success({
-                    actionFilter: function(args) {
-                      if (args.context.networks[0].state == 'Destroyed')
-                        return [];
-
-                      if (args.context.networks[0].type == 'Shared' ||
-                          !$.grep(args.context.networks[0].service, function(service) {
-                            return service.name == 'SourceNat';
-                          }).length) {
-                        return ['edit', 'restart'];
-                      }
-
-                      return args.context.actions;
-                    },
-                    data: args.context.networks[0]
-                  });
+                dataProvider: function(args) {								 					
+								  $.ajax({
+										url: createURL("listNetworks&id=" + args.context.networks[0].id),
+										dataType: "json",
+										async: true,
+										success: function(json) {								  
+											var jsonObj = json.listnetworksresponse.network[0];   
+											args.response.success(
+												{
+													actionFilter: networkActionfilter,
+													data: jsonObj
+												}
+											);		
+										}
+									});			
                 }
               },
 
@@ -2908,4 +2907,23 @@
       }
     }
   };
+	
+	 var networkActionfilter = function(args) {
+    var jsonObj = args.context.item;
+		var allowedActions = [];
+
+		if (jsonObj.state == 'Destroyed')
+			return [];
+
+		if (jsonObj.type == 'Shared' ||
+				!$.grep(jsonObj.service, function(service) {
+					return service.name == 'SourceNat';
+				}).length) {
+			 allowedActions.push('edit');
+			 allowedActions.push('restart');                        
+		}
+
+		return allowedActions;
+	}
+	
 })(cloudStack, jQuery);