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

bug 8980: Fixed UI to no longer allow domain dedication of public VLAN.

This commit is contained in:
will 2011-03-14 17:45:46 -07:00
parent c7be5c6ee1
commit 18f33d017a
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ui/scripts/cloud.core.configuration.js
View File

@ -1034,16 +1034,21 @@ function showConfigurationTab() {
dialogAddVlanForZone.find("#add_publicip_vlan_vlan_container").show();
dialogAddVlanForZone.find("#add_publicip_vlan_pod_container").hide();
dialogAddVlanForZone.find("#vlan_scope_domain").show();
dialogAddVlanForZone.find("#vlan_scope_account").show();
} else { //public VLAN
addPublicipVlanTagged.append('<option value="untagged">untagged</option>').append('<option value="tagged">tagged</option>');
if (dialogAddVlanForZone.find("#add_publicip_vlan_tagged") == "tagged") {
dialogAddVlanForZone.find("#add_publicip_vlan_vlan_container").show();
dialogAddVlanForZone.find("#add_publicip_vlan_pod_container").hide();
dialogAddVlanForZone.find("#vlan_scope_domain").hide();
dialogAddVlanForZone.find("#vlan_scope_account").show();
} else {
dialogAddVlanForZone.find("#add_publicip_vlan_vlan_container").hide();
dialogAddVlanForZone.find("#add_publicip_vlan_pod_container").hide();
dialogAddVlanForZone.find("#add_publicip_vlan_pod_container").hide();
dialogAddVlanForZone.find("#vlan_scope_domain").hide();
}
addPublicipVlanTagged.change();
}
@ -1058,16 +1063,19 @@ function showConfigurationTab() {
if (dialogAddVlanForZone.find("#add_publicip_vlan_type").val() == "false") { //direct VLAN (only tagged option)
dialogAddVlanForZone.find("#add_publicip_vlan_vlan_container").show();
dialogAddVlanForZone.find("#add_publicip_vlan_pod_container").hide();
dialogAddVlanForZone.find("#vlan_scope_domain").show();
dialogAddVlanForZone.find("#vlan_scope_account").show();
} else { //public VLAN
if ($(this).val() == "tagged") {
dialogAddVlanForZone.find("#add_publicip_vlan_vlan_container").show();
dialogAddVlanForZone.find("#add_publicip_vlan_pod_container").hide();
dialogAddVlanForZone.find("#vlan_scope_domain").hide();
dialogAddVlanForZone.find("#vlan_scope_account").show();
} else {
dialogAddVlanForZone.find("#vlan_scope_account").hide();
dialogAddVlanForZone.find("#add_publicip_vlan_vlan_container").hide();
dialogAddVlanForZone.find("#add_publicip_vlan_pod_container").hide();
dialogAddVlanForZone.find("#vlan_scope_domain").hide();
}
}
return false;