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

bug 8655: Network page - Add Network dialog - show only 1 option("account-specific") in scope field when zone.securitygroupsenabled is true.

This commit is contained in:
Jessica Wang 2011-02-25 15:44:27 -08:00
parent ac8524da51
commit ac144e1446
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/jsp/network.jsp
View File

@ -1238,9 +1238,11 @@ dictionary = {
<li id="add_publicip_vlan_scope_container">
<label for="add_publicip_vlan_scope">
<fmt:message key="label.scope"/>:</label>
<select class="select" id="add_publicip_vlan_scope">
<select class="select" id="add_publicip_vlan_scope">
<!--
<option value="zone-wide"><fmt:message key="label.zone.wide"/></option>
<option value="account-specific"><fmt:message key="label.account.specific"/></option>
<option value="account-specific"><fmt:message key="label.account.specific"/></option>
-->
</select>
</li>
<li style="display: none" id="add_publicip_vlan_domain_container">

7
ui/scripts/cloud.core.network.js
View File

@ -1173,7 +1173,12 @@ function bindAddNetworkButton($button) {
return;
var $dialogAddNetworkForZone = $("#dialog_add_network_for_zone");
if(zoneObj.securitygroupsenabled)
$dialogAddNetworkForZone.find("#add_publicip_vlan_scope").empty().append('<option value="account-specific">account-specific</option>');
else
$dialogAddNetworkForZone.find("#add_publicip_vlan_scope").empty().append('<option value="zone-wide">zone-wide</option>').append('<option value="account-specific">account-specific</option>');
$dialogAddNetworkForZone.find("#add_publicip_vlan_scope").change(function(event) {
if($(this).val() == "zone-wide") {
$dialogAddNetworkForZone.find("#add_publicip_vlan_domain_container").hide();