From cd957604b3de53f8fc5231f080d424728fbafc36 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Mon, 28 Nov 2011 11:49:33 -0800
Subject: [PATCH] cloudStack 3.0 new UI - system - basic zone - guest network -
 remove Edit action.

---
 ui/scripts/system.js | 34 +++++++++++++---------------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index a080a08aa1f..3fb4d4615ef 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -305,8 +305,7 @@
           
             tabs: {
               details: {
-                title: 'Details',
-                                
+                title: 'Details',                                
                 preFilter: function(args) {                 
                   var hiddenFields = [];
                   if(selectedZoneObj.networktype == "Basic") {
@@ -314,8 +313,7 @@
                     hiddenFields.push("guestcidraddress");
                   }
                   return hiddenFields;
-                },            
-                
+                },             
                 fields: [
                   {
                     name: { label: 'Name' }
@@ -335,23 +333,17 @@
                     }                    
                   }
                 ],
-                dataProvider: function(args) {      
-                  /*                
-                  $.ajax({
-                    url: createURL("listPhysicalNetworks&zoneId=" + args.context.zones[0].id),
-                    dataType: "json",
-                    async: false,
-                    success: function(json) {                      
-                      var items = json.listphysicalnetworksresponse.physicalnetwork;                      
-                      selectedPhysicalNetworkObj = items[0];                                             
-                    }
-                  });  
-                  */
-                  
-                  selectedPhysicalNetworkObj["guestcidraddress"] = selectedZoneObj.guestcidraddress;
-                  //selectedZoneObj = args.context.zones[0];
-									
-                  args.response.success({ data: selectedPhysicalNetworkObj });                  
+                dataProvider: function(args) {  
+                  selectedPhysicalNetworkObj["guestcidraddress"] = selectedZoneObj.guestcidraddress;                  									
+                  args.response.success({ 
+                    actionFilter: function() {                      
+                      var allowedActions = [];
+                      if(selectedZoneObj.networktype == "Advanced")
+                        allowedActions.push("edit");
+                      return allowedActions;
+                    },
+                    data: selectedPhysicalNetworkObj 
+                  });                  
                 }
               },