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 9579: cloudStack UI - Network page - Add Direct Network - add new field "Network Domain".

Browse Source
This commit is contained in:
Jessica Wang 2011-06-17 09:28:11 -07:00
parent a5264297ed
commit 96bb76a596
2 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ui/jsp/network.jsp
View File

@ -384,8 +384,20 @@ dictionary = {
<div class="row_celltitles" id="netmask">
</div>
</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.network.domain"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="networkdomain">
</div>
<input class="text" id="tags_edit" style="width: 200px; display: none;" type="text" />
<div id="networkdomain_edit_errormsg" style="display:none"></div>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.tags"/>:</div>
@ -397,7 +409,7 @@ dictionary = {
<div id="tags_edit_errormsg" style="display:none"></div>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.domain"/>:</div>
@ -407,7 +419,7 @@ dictionary = {
</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.account"/>:</div>
@ -1320,7 +1332,14 @@ dictionary = {
</div>
<div id="add_publicip_vlan_endip_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
</div>
</li>
</li>
<li>
<label>
<fmt:message key="label.network.domain"/>:</label>
<input class="text" type="text" id="networkdomain" />
<div id="networkdomain_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
</div>
</li>
<li>
<label>
<fmt:message key="label.tags"/>:</label>

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

@ -1069,7 +1069,9 @@ function directNetworkJsonToDetailsTab() {
$thisTab.find("#default").text((jsonObj.isdefault) ? "Yes" : "No");
$thisTab.find("#vlan").text(fromdb(jsonObj.vlan));
$thisTab.find("#gateway").text(fromdb(jsonObj.gateway));
$thisTab.find("#netmask").text(fromdb(jsonObj.netmask));
$thisTab.find("#netmask").text(fromdb(jsonObj.netmask));
$thisTab.find("#networkdomain").text(fromdb(jsonObj.networkdomain));
$thisTab.find("#networkdomain_edit").val(fromdb(jsonObj.networkdomain));
$thisTab.find("#tags").text(fromdb(jsonObj.tags));
$thisTab.find("#tags_edit").val(fromdb(jsonObj.tags));
$thisTab.find("#domain").text(fromdb(jsonObj.domain)); //might be null
@ -1101,6 +1103,8 @@ function directNetworkJsonClearDetailsTab() {
$thisTab.find("#vlan").text("");
$thisTab.find("#gateway").text("");
$thisTab.find("#netmask").text("");
$thisTab.find("#networkdomain").text("");
$thisTab.find("#networkdomain_edit").val("");
$thisTab.find("#tags").text("");
$thisTab.find("#tags_edit").val("");
$thisTab.find("#domain").text("");
@ -1259,6 +1263,7 @@ function bindAddNetworkButton() {
isValid &= validateIp("Netmask", $thisDialog.find("#add_publicip_vlan_netmask"), $thisDialog.find("#add_publicip_vlan_netmask_errormsg"));
isValid &= validateIp("Start IP Range", $thisDialog.find("#add_publicip_vlan_startip"), $thisDialog.find("#add_publicip_vlan_startip_errormsg")); //required
isValid &= validateIp("End IP Range", $thisDialog.find("#add_publicip_vlan_endip"), $thisDialog.find("#add_publicip_vlan_endip_errormsg"), true); //optional
isValid &= validateString("Network Domain", $thisDialog.find("#networkdomain"), $thisDialog.find("#networkdomain_errormsg"), true); //optional
isValid &= validateString("Tags", $thisDialog.find("#tags"), $thisDialog.find("#tags_errormsg"), true); //optional
if($thisDialog.find("#domain_container").css("display") != "none") {
@ -1335,9 +1340,14 @@ function bindAddNetworkButton() {
var endip = $thisDialog.find("#add_publicip_vlan_endip").val();
array1.push("&endip="+todb(endip));
var networkdomain = $thisDialog.find("#networkdomain").val();
if(networkdomain != null && networkdomain.length > 0)
array1.push("&networkdomain="+todb(networkdomain));
var tags = $thisDialog.find("#tags").val();
array1.push("&tags="+todb(tags));
if(tags != null && tags.length > 0)
array1.push("&tags="+todb(tags));
// Creating network for the direct networking
$.ajax({