apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 7604: physical resource - zone - network - create network - call even handler of VLAN scope when everytime Create Network Button is clicked.

Browse Source
This commit is contained in:
Jessica Wang 2010-12-21 16:58:36 -08:00
parent 1bea7b856a
commit c10b79c7b0
2 changed files with 13 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ui/jsp/network.jsp
View File

@ -901,14 +901,14 @@
<div class="dialog_formcontent">
<form action="#" method="post" id="form_acquire">
<ol>
<li style="display: none" id="add_publicip_vlan_network_name_container">
<li>
<label for="user_name">
Network Name:</label>
<input class="text" type="text" name="add_publicip_vlan_network_name" id="add_publicip_vlan_network_name" />
<div id="add_publicip_vlan_network_name_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
</div>
</li>
<li style="display: none" id="add_publicip_vlan_network_desc_container">
<li>
<label for="user_name">
Network Desc:</label>
<input class="text" type="text" name="add_publicip_vlan_network_desc" id="add_publicip_vlan_network_desc" />
@ -932,11 +932,9 @@
<li id="add_publicip_vlan_scope_container">
<label for="add_publicip_vlan_scope">
Scope:</label>
<select class="select" name="add_publicip_vlan_scope" id="add_publicip_vlan_scope">
<!--
<select class="select" id="add_publicip_vlan_scope">
<option value="zone-wide">zone-wide</option>
<option value="account-specific">account-specific</option>
-->
<option value="account-specific">account-specific</option>
</select>
</li>
<li style="display: none" id="add_publicip_vlan_domain_container">

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

@ -521,7 +521,7 @@ function bindAddIpRangeToPublicNetworkButton($button, $midmenuItem1) {
}
var scopeParams = "";
if($dialogAddIpRangeToPublicNetwork.find("#add_publicip_vlan_scope").val()=="account-specific") {
if($dialogAddIpRangeToPublicNetwork.find("#add_publicip_vlan_scope").val() == "account-specific") {
scopeParams = "&domainId="+trim($thisDialog.find("#add_publicip_vlan_domain").val())+"&account="+trim($thisDialog.find("#add_publicip_vlan_account").val());
} else if (isDirect) {
scopeParams = "&isshared=true";
@ -1003,26 +1003,8 @@ function bindAddNetworkButton($button) {
return;
var $dialogAddNetworkForZone = $("#dialog_add_network_for_zone");
//***** binding Event Handler (begin) ******
$dialogAddNetworkForZone.find("#add_publicip_vlan_network_name_container, #add_publicip_vlan_network_desc_container").show();
$dialogAddNetworkForZone.find("#add_publicip_vlan_scope").empty().append('<option value="zone-wide">zone-wide</option>').append('<option value="account-specific">account-specific</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".
$dialogAddNetworkForZone.find("#add_publicip_vlan_scope").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".
$dialogAddNetworkForZone.find("#add_publicip_vlan_scope").change();
if (zoneObj.networktype == "Advanced") {
}
else {
$dialogAddNetworkForZone.find("#add_publicip_vlan_container").hide();
}
$dialogAddNetworkForZone.find("#add_publicip_vlan_scope").change(function(event) {
$dialogAddNetworkForZone.find("#add_publicip_vlan_scope").change(function(event) {
if($(this).val() == "zone-wide") {
$dialogAddNetworkForZone.find("#add_publicip_vlan_domain_container").hide();
$dialogAddNetworkForZone.find("#add_publicip_vlan_account_container").hide();
@ -1033,15 +1015,13 @@ function bindAddNetworkButton($button) {
}
return false;
});
//***** binding Event Handler (end) ******
$button.show();
$button.unbind("click").bind("click", function(event) {
$dialogAddNetworkForZone.find("#info_container").hide();
$dialogAddNetworkForZone.find("#zone_name").text(fromdb(zoneObj.name));
$dialogAddNetworkForZone.find("#add_publicip_vlan_domain_container, #add_publicip_vlan_account_container").hide();
$button.unbind("click").bind("click", function(event) {
$dialogAddNetworkForZone.find("#info_container").hide();
$dialogAddNetworkForZone.find("#zone_name").text(fromdb(zoneObj.name));
$dialogAddNetworkForZone.find("#add_publicip_vlan_vlan, #add_publicip_vlan_gateway, #add_publicip_vlan_netmask, #add_publicip_vlan_startip, #add_publicip_vlan_endip, #add_publicip_vlan_account").val("");
$dialogAddNetworkForZone.find("#add_publicip_vlan_scope").change();
if (zoneObj.networktype == 'Basic') {
}