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

bug 6764: zone page - Add VLAN dialog - public untagged has only one option ("zone-wide") in scope.

This commit is contained in:
Jessica Wang 2010-11-18 11:43:26 -08:00
parent 6ae21932eb
commit 740b4e7c4c
2 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/jsp/zone.jsp
View File

@ -378,8 +378,10 @@
<label for="add_publicip_vlan_scope">
Scope:</label>
<select class="select" name="add_publicip_vlan_scope" id="add_publicip_vlan_scope">
<!--
<option value="zone-wide">zone-wide</option>
<option value="account-specific">account-specific</option>
-->
</select>
</li>
<li style="display: none" id="add_publicip_vlan_pod_container">

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

@ -612,50 +612,50 @@ function bindEventHandlerToDialogAddVlanForZone() {
dialogAddVlanForZone.find("#add_publicip_vlan_type").change(function(event) {
var addPublicipVlanTagged = dialogAddVlanForZone.find("#add_publicip_vlan_tagged").empty();
// default value of "#add_publicip_vlan_scope" is "zone-wide". Calling change() will hide "#add_publicip_vlan_domain_container", "#add_publicip_vlan_account_container".
dialogAddVlanForZone.find("#add_publicip_vlan_scope").change();
if ($(this).val() == "false") { //direct VLAN (only tagged option)
addPublicipVlanTagged.append('<option value="tagged">tagged</option>');
dialogAddVlanForZone.find("#add_publicip_vlan_vlan_container").show();
dialogAddVlanForZone.find("#add_publicip_vlan_pod_container").hide();
} 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();
} else {
dialogAddVlanForZone.find("#add_publicip_vlan_vlan_container").hide();
dialogAddVlanForZone.find("#add_publicip_vlan_pod_container").hide();
}
}
else if ($(this).val() == "true") { //public VLAN
addPublicipVlanTagged.append('<option value="untagged">untagged</option>').append('<option value="tagged">tagged</option>');
}
dialogAddVlanForZone.find("#add_publicip_vlan_tagged").change();
// default value of "#add_publicip_vlan_scope" is "zone-wide". Calling change() will hide "#add_publicip_vlan_domain_container", "#add_publicip_vlan_account_container".
dialogAddVlanForZone.find("#add_publicip_vlan_scope").change();
return false;
});
if (getNetworkType() != "vnet") {
dialogAddVlanForZone.find("#add_publicip_vlan_tagged").change(function(event) {
dialogAddVlanForZone.find("#add_publicip_vlan_tagged").change(function(event) {
if ($(this).val() == "tagged") {
dialogAddVlanForZone.find("#add_publicip_vlan_vlan_container").show();
dialogAddVlanForZone.find("#add_publicip_vlan_pod_container").hide();
dialogAddVlanForZone.find("#add_publicip_vlan_scope").empty().append('<option value="zone-wide">zone-wide</option>').append('<option value="account-specific">account-specific</option>');
}
else if($(this).val() == "untagged") {
dialogAddVlanForZone.find("#add_publicip_vlan_vlan_container").hide();
dialogAddVlanForZone.find("#add_publicip_vlan_pod_container").hide();
dialogAddVlanForZone.find("#add_publicip_vlan_scope").empty().append('<option value="zone-wide">zone-wide</option>');
}
// default value of "#add_publicip_vlan_scope" is "zone-wide". Calling change() will hide "#add_publicip_vlan_domain_container", "#add_publicip_vlan_account_container".
dialogAddVlanForZone.find("#add_publicip_vlan_scope").change();
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();
} else { //public VLAN
if ($(this).val() == "tagged") {
dialogAddVlanForZone.find("#add_publicip_vlan_vlan_container").show();
dialogAddVlanForZone.find("#add_publicip_vlan_pod_container").hide();
} else {
dialogAddVlanForZone.find("#add_publicip_vlan_vlan_container").hide();
dialogAddVlanForZone.find("#add_publicip_vlan_pod_container").hide();
}
}
return false;
});
} else {
dialogAddVlanForZone.find("#add_publicip_vlan_tagged").change();
}
else {
dialogAddVlanForZone.find("#add_publicip_vlan_container").hide();
}
@ -663,7 +663,8 @@ function bindEventHandlerToDialogAddVlanForZone() {
if($(this).val() == "zone-wide") {
dialogAddVlanForZone.find("#add_publicip_vlan_domain_container").hide();
dialogAddVlanForZone.find("#add_publicip_vlan_account_container").hide();
} else { // account-specific
}
else if($(this).val() == "account-specific") {
dialogAddVlanForZone.find("#add_publicip_vlan_domain_container").show();
dialogAddVlanForZone.find("#add_publicip_vlan_account_container").show();
}