From fed5bbcfbe198bf68de0a48ff8d04771c3db86a1 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Wed, 17 Nov 2010 12:24:31 -0800 Subject: [PATCH] bug 7208: not pass vlan parameter to CreateZone API if vlan is null. --- ui/scripts/cloud.core.resource.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/ui/scripts/cloud.core.resource.js b/ui/scripts/cloud.core.resource.js index a0ae9121bf3..b73fc14d8aa 100644 --- a/ui/scripts/cloud.core.resource.js +++ b/ui/scripts/cloud.core.resource.js @@ -752,12 +752,14 @@ function addZoneWizardSubmit($thisWizard) { moreCriteria.push("&internaldns2="+encodeURIComponent(internaldns2)); if($thisWizard.find("#step2").find("#add_zone_vlan_container").css("display") != "none") { - var vlanStart = trim($thisWizard.find("#add_zone_startvlan").val()); - var vlanEnd = trim($thisWizard.find("#add_zone_endvlan").val()); - if (vlanEnd != null && vlanEnd.length > 0) - moreCriteria.push("&vlan=" + encodeURIComponent(vlanStart + "-" + vlanEnd)); - else - moreCriteria.push("&vlan=" + encodeURIComponent(vlanStart)); + var vlanStart = $thisWizard.find("#add_zone_startvlan").val(); + if(vlanStart != null && vlanStart.length > 0) { + var vlanEnd = $thisWizard.find("#add_zone_endvlan").val(); + if (vlanEnd != null && vlanEnd.length > 0) + moreCriteria.push("&vlan=" + encodeURIComponent(vlanStart + "-" + vlanEnd)); + else + moreCriteria.push("&vlan=" + encodeURIComponent(vlanStart)); + } } var guestcidraddress = trim($thisWizard.find("#add_zone_guestcidraddress").val());