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 10340: CloudStack UI - IP Address page - Port Forwarding tab - add new field "CIDR".

Browse Source
This commit is contained in:
Jessica Wang 2011-06-20 11:55:52 -07:00
parent 1f087371e0
commit cfe2af8db8
2 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ui/jsp/ipaddress.jsp
View File

@ -289,6 +289,10 @@ dictionary = {
<div id="tab_container"> <div id="tab_container">
<div class="grid_container" id="grid_container"> <div class="grid_container" id="grid_container">
<div class="grid_header"> <div class="grid_header">
<div class="grid_header_cell" style="width: 10%; ">
<div class="grid_header_title">
<fmt:message key="label.cidr"/></div>
</div>
<div class="grid_header_cell" style="width: 15%; "> <div class="grid_header_cell" style="width: 15%; ">
<div class="grid_header_title"> <div class="grid_header_title">
<fmt:message key="label.public.port"/></div> <fmt:message key="label.public.port"/></div>
@ -297,7 +301,7 @@ dictionary = {
<div class="grid_header_title"> <div class="grid_header_title">
<fmt:message key="label.private.port"/></div> <fmt:message key="label.private.port"/></div>
</div> </div>
<div class="grid_header_cell" style="width: 15%; "> <div class="grid_header_cell" style="width: 10%; ">
<div class="grid_header_title"> <div class="grid_header_title">
<fmt:message key="label.protocol"/></div> <fmt:message key="label.protocol"/></div>
</div> </div>
@ -309,12 +313,16 @@ dictionary = {
<div class="grid_header_title"> <div class="grid_header_title">
<fmt:message key="label.state"/></div> <fmt:message key="label.state"/></div>
</div> </div>
<div class="grid_header_cell" style="width: 15%; "> <div class="grid_header_cell" style="width: 10%; ">
<div class="grid_header_title"> <div class="grid_header_title">
<fmt:message key="label.actions"/></div> <fmt:message key="label.actions"/></div>
</div> </div>
</div> </div>
<div class="grid_rows even" id="create_port_forwarding_row"> <div class="grid_rows even" id="create_port_forwarding_row">
<div class="grid_row_cell" style="width: 10%; ">
<input id="cidr" class="text" type="text" />
<div id="cidr_errormsg" class="errormsg" style="display: none;">Error msg will appear here</div>
</div>
<div class="grid_row_cell" style="width: 15%; "> <div class="grid_row_cell" style="width: 15%; ">
<input id="public_port" class="text" style="width: 30%; " type="text" /> <input id="public_port" class="text" style="width: 30%; " type="text" />
<div id="public_port_errormsg" class="errormsg" style="display: none;">Error msg will appear here</div> <div id="public_port_errormsg" class="errormsg" style="display: none;">Error msg will appear here</div>
@ -333,7 +341,7 @@ dictionary = {
<input id="private_end_port" class="text" style="width: 30%; " type="text" /> <input id="private_end_port" class="text" style="width: 30%; " type="text" />
<div id="private_end_port_errormsg" class="errormsg" style="display: none;">Error msg will appear here</div> <div id="private_end_port_errormsg" class="errormsg" style="display: none;">Error msg will appear here</div>
</div> </div>
<div class="grid_row_cell" style="width: 15%; "> <div class="grid_row_cell" style="width: 10%; ">
<select class="select" id="protocol" style="width:70%;"> <select class="select" id="protocol" style="width:70%;">
</select> </select>
</div> </div>
@ -345,7 +353,7 @@ dictionary = {
<div class="grid_row_cell" style="width: 10%; "> <div class="grid_row_cell" style="width: 10%; ">
<div class="row_celltitles" id="state" style="padding:1px;"></div> <div class="row_celltitles" id="state" style="padding:1px;"></div>
</div> </div>
<div class="grid_row_cell" style="width: 15%; "> <div class="grid_row_cell" style="width: 10%; ">
<div class="row_celltitles"> <div class="row_celltitles">
<a id="add_link" href="#"><fmt:message key="label.add"/></a></div> <a id="add_link" href="#"><fmt:message key="label.add"/></a></div>
</div> </div>
@ -641,13 +649,16 @@ dictionary = {
<!-- Port Forwarding template (begin) --> <!-- Port Forwarding template (begin) -->
<div class="grid_rows odd" id="port_forwarding_template" style="display: none"> <div class="grid_rows odd" id="port_forwarding_template" style="display: none">
<div id="row_container"> <div id="row_container">
<div class="grid_row_cell" style="width: 10%; ">
<div class="row_celltitles" id="cidr" style="padding:1px;"></div>
</div>
<div class="grid_row_cell" style="width: 15%; "> <div class="grid_row_cell" style="width: 15%; ">
<div class="row_celltitles" id="public_port"></div> <div class="row_celltitles" id="public_port"></div>
</div> </div>
<div class="grid_row_cell" style="width: 15%; "> <div class="grid_row_cell" style="width: 15%; ">
<div class="row_celltitles" id="private_port"></div> <div class="row_celltitles" id="private_port"></div>
</div> </div>
<div class="grid_row_cell" style="width: 15%; "> <div class="grid_row_cell" style="width: 10%; ">
<div class="row_celltitles" id="protocol"></div> <div class="row_celltitles" id="protocol"></div>
</div> </div>
<div class="grid_row_cell" style="width: 25%; "> <div class="grid_row_cell" style="width: 25%; ">
@ -656,7 +667,7 @@ dictionary = {
<div class="grid_row_cell" style="width: 10%; "> <div class="grid_row_cell" style="width: 10%; ">
<div class="row_celltitles" id="state" style="padding:1px;"></div> <div class="row_celltitles" id="state" style="padding:1px;"></div>
</div> </div>
<div class="grid_row_cell" style="width: 15%; "> <div class="grid_row_cell" style="width: 10%; ">
<div class="row_celltitles"> <div class="row_celltitles">
<a id="delete_link" href="#" style="float:left;"><fmt:message key="label.delete"/> </a> <a id="delete_link" href="#" style="float:left;"><fmt:message key="label.delete"/> </a>
</div> </div>

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

@ -281,13 +281,15 @@ function afterLoadIpJSP() {
$createPortForwardingRow.find("#add_link").bind("click", function(event){ $createPortForwardingRow.find("#add_link").bind("click", function(event){
var isValid = true; var isValid = true;
isValid &= validateDropDownBox("Instance", $createPortForwardingRow.find("#vm"), $createPortForwardingRow.find("#vm_errormsg")); isValid &= validateCIDR("CIDR", $createPortForwardingRow.find("#cidr"), $createPortForwardingRow.find("#cidr_errormsg"), true); //optional
isValid &= validateInteger("Public Port", $createPortForwardingRow.find("#public_port"), $createPortForwardingRow.find("#public_port_errormsg"), 1, 65535, false); //required isValid &= validateInteger("Public Port", $createPortForwardingRow.find("#public_port"), $createPortForwardingRow.find("#public_port_errormsg"), 1, 65535, false); //required
isValid &= validateInteger("Public End Port", $createPortForwardingRow.find("#public_end_port"), $createPortForwardingRow.find("#public_end_port_errormsg"), 1, 65535, true); //optional isValid &= validateInteger("Public End Port", $createPortForwardingRow.find("#public_end_port"), $createPortForwardingRow.find("#public_end_port_errormsg"), 1, 65535, true); //optional
isValid &= validateInteger("Private Port", $createPortForwardingRow.find("#private_port"), $createPortForwardingRow.find("#private_port_errormsg"), 1, 65535, false); //required isValid &= validateInteger("Private Port", $createPortForwardingRow.find("#private_port"), $createPortForwardingRow.find("#private_port_errormsg"), 1, 65535, false); //required
isValid &= validateInteger("Private End Port", $createPortForwardingRow.find("#private_end_port"), $createPortForwardingRow.find("#private_end_port_errormsg"), 1, 65535, true); //optional isValid &= validateInteger("Private End Port", $createPortForwardingRow.find("#private_end_port"), $createPortForwardingRow.find("#private_end_port_errormsg"), 1, 65535, true); //optional
isValid &= validateDropDownBox("Instance", $createPortForwardingRow.find("#vm"), $createPortForwardingRow.find("#vm_errormsg"));
if (!isValid) if (!isValid)
return; return;
@ -304,6 +306,10 @@ function afterLoadIpJSP() {
var array1 = []; var array1 = [];
array1.push("&ipaddressid="+ipObj.id); array1.push("&ipaddressid="+ipObj.id);
var cidr = $createPortForwardingRow.find("#cidr").val();
if(cidr != null && cidr.length > 0)
array1.push("&cidrlist="+cidr);
var publicPort = $createPortForwardingRow.find("#public_port").val(); var publicPort = $createPortForwardingRow.find("#public_port").val();
array1.push("&publicport="+publicPort); array1.push("&publicport="+publicPort);
var publicEndPort = $createPortForwardingRow.find("#public_end_port").val(); var publicEndPort = $createPortForwardingRow.find("#public_end_port").val();
@ -1506,6 +1512,8 @@ function ipClearPortForwardingTab() {
function portForwardingJsonToTemplate(jsonObj, $template) { function portForwardingJsonToTemplate(jsonObj, $template) {
$template.attr("id", "portForwarding_" + fromdb(jsonObj.id)).data("portForwardingId", fromdb(jsonObj.id)); $template.attr("id", "portForwarding_" + fromdb(jsonObj.id)).data("portForwardingId", fromdb(jsonObj.id));
$template.find("#cidr").text(fromdb(jsonObj.cidrlist));
var publicPort = fromdb(jsonObj.publicport); var publicPort = fromdb(jsonObj.publicport);
if(jsonObj.publicendport != null && jsonObj.publicendport.length > 0) if(jsonObj.publicendport != null && jsonObj.publicendport.length > 0)
publicPort += (" - " + fromdb(jsonObj.publicendport)); publicPort += (" - " + fromdb(jsonObj.publicendport));