etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 7208: not pass vlan parameter to UpdateZone API if vlan is null

This commit is contained in:
Jessica Wang 2010-11-17 13:09:11 -08:00
parent 38292fcd02
commit b6f15213e5
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ui/scripts/cloud.core.zone.js
View File

@ -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());