From 8a0350ec959a98b5dc5aeb56c217831db328d43e Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Wed, 14 Dec 2011 14:05:44 -0800
Subject: [PATCH] bug 12534: Add Guest network - remove isDefault checkbox.

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

diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index a3d4b7ac3b7..d94d4b6da88 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -518,8 +518,7 @@
                       createForm: {
                         title: 'Create network',
                         preFilter: function(args) {
-                          if(selectedZoneObj.networktype == "Basic") {
-                            args.$form.find('.form-item[rel=isDefault]').hide();
+                          if(selectedZoneObj.networktype == "Basic") {                           
                             args.$form.find('.form-item[rel=vlanTagged]').hide();
                             args.$form.find('.form-item[rel=vlanId]').hide();
                             args.$form.find('.form-item[rel=scope]').hide();
@@ -529,8 +528,7 @@
 
                             args.$form.find('.form-item[rel=podId]').css('display', 'inline-block');
                           }
-                          else {  //"Advanced"
-                            args.$form.find('.form-item[rel=isDefault]').css('display', 'inline-block');
+                          else {  //"Advanced"                           
                             args.$form.find('.form-item[rel=vlanTagged]').css('display', 'inline-block');
                             args.$form.find('.form-item[rel=vlanId]').css('display', 'inline-block');
                             args.$form.find('.form-item[rel=scope]').css('display', 'inline-block');
@@ -549,11 +547,7 @@
                           description: {
                             label: 'Description',
                             validation: { required: true }
-                          },
-                          isDefault: {
-                            label: "Default",
-                            isBoolean: true
-                          },
+                          },                          
                           vlanTagged: {
                             label: 'VLAN',
                             select: function(args) {
@@ -787,8 +781,7 @@
                           else { //zone-wide
                             array1.push("&acltype=domain"); //server-side will make it Root domain (i.e. domainid=1)
                           }
-
-                          array1.push("&isDefault=" + (args.data.isDefault=="on"));
+                         
                           array1.push("&gateway=" + args.data.guestGateway);
                           array1.push("&netmask=" + args.data.guestNetmask);
                           array1.push("&startip=" + args.data.guestStartIp);
@@ -1066,11 +1059,7 @@
                                 else if(booleanValue == false)
                                   return "No";
                               },
-                            },
-                            isdefault: {
-                              label: 'Default',
-                              converter: cloudStack.converters.toBooleanText
-                            },
+                            },                           
                             vlan: { label: 'VLAN ID' },
 
                             networkofferingdisplaytext: { label: 'Network offering' },