From b6f15213e5b8ac2ec4fdc37f1f6f8cb79182f423 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Wed, 17 Nov 2010 13:09:11 -0800
Subject: [PATCH] bug 7208: not pass vlan parameter to UpdateZone API if vlan
 is null

---
 ui/scripts/cloud.core.zone.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/ui/scripts/cloud.core.zone.js b/ui/scripts/cloud.core.zone.js
index f191881b544..d6853c7a117 100644
--- a/ui/scripts/cloud.core.zone.js
+++ b/ui/scripts/cloud.core.zone.js
@@ -790,12 +790,14 @@ function doEditZone2($actionLink, $detailsTab, $midmenuItem1, $readonlyFields, $
 	var vlan;				
 	if ($("#tab_content_details #vlan_container").css("display") != "none") {
 		var vlanStart = trim($detailsTab.find("#startvlan_edit").val());	
-		var vlanEnd = trim($detailsTab.find("#endvlan_edit").val());						
-		if (vlanEnd != null && vlanEnd.length > 0) 
-		    vlan = vlanStart + "-" + vlanEnd;						    							
-		else 	
-		    vlan = vlanStart;							
-       moreCriteria.push("&vlan=" + encodeURIComponent(vlan));	
+		if(vlanStart != null && vlanStart.length > 0) {
+		    var vlanEnd = trim($detailsTab.find("#endvlan_edit").val());						
+		    if (vlanEnd != null && vlanEnd.length > 0) 
+		        vlan = vlanStart + "-" + vlanEnd;						    							
+		    else 	
+		        vlan = vlanStart;							
+           moreCriteria.push("&vlan=" + encodeURIComponent(vlan));	
+        }
 	}				
 	
 	var guestcidraddress = trim($detailsTab.find("#guestcidraddress_edit").val());