From dbb7f940bf6e4e941ccf986c9d26bc9215e2cbbf Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Wed, 30 Nov 2011 10:30:14 -0800
Subject: [PATCH] cloudStack 3.0 new UI - zone chart - guest - network tab -
 guest network detail - edit - split network offerings into 2 fields: one is
 editable, the other one is not. Show editable now when network type is
 Isolated. Show the other one otherwise.

---
 ui/scripts/system.js | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 7fb5308d8e5..2a2010ae21c 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -743,8 +743,10 @@
                           var array1 = [];                          
                           array1.push("&name=" + todb(args.data.name));
                           array1.push("&displaytext=" + todb(args.data.displaytext));
-                          array1.push("&networkdomain=" + args.data.networkdomain); 
-                          array1.push("&networkofferingid=" + todb(args.data.networkofferingid));    //???                     
+                          array1.push("&networkdomain=" + args.data.networkdomain);                           
+                          //if(selectedGuestNetworkObj.type != "Isolated")
+                          if(args.data.networkofferingid != null)
+                            array1.push("&networkofferingid=" + todb(args.data.networkofferingid));    //???                     
                           $.ajax({
                             url: createURL("updateNetwork&id=" + args.context.networks[0].id + array1.join("")),
                             dataType: "json",
@@ -810,7 +812,7 @@
 										tabs: {
 											details: {
 												title: 'Details',                                                
-                        preFilter: function(args) { 
+                        preFilter: function(args) { //???
                           var hiddenFields = [];                          
                           if(selectedZoneObj.networktype == "Basic") {
                             hiddenFields.push("account");
@@ -818,7 +820,14 @@
                             hiddenFields.push("netmask");
                             hiddenFields.push("startip");
                             hiddenFields.push("endip");                           
-                          }                          
+                          }  
+                          if(selectedGuestNetworkObj.type == "Isolated") {
+                            hiddenFields.push("networkofferingdisplaytext");
+                          }
+                          else {
+                            hiddenFields.push("networkofferingid");
+                          }
+                          
                           return hiddenFields;
                         },                        
 												fields: [
@@ -840,7 +849,7 @@
 														},
                             vlan: { label: 'VLAN ID' },
                             
-                            //networkofferingdisplaytext: { label: 'Network offering' },
+                            networkofferingdisplaytext: { label: 'Network offering name' },
                             networkofferingid: { 
                               label: 'Network offering',
                               isEditable: true,