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

IP Address page - Port Forwarding tab - populate protocol dropdown by network service firewall SupportedProtocols data (instead of hard-coding).

This commit is contained in:
Jessica Wang 2010-12-23 20:00:00 -08:00
parent c737ba1585
commit 66e0ca1298
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/jsp/ipaddress.jsp
View File

@ -232,8 +232,10 @@
</div>
<div class="grid_row_cell" style="width: 15%; padding: 1px;">
<select class="select" id="protocol" style="width:70%;">
<!--
<option value="TCP">TCP</option>
<option value="UDP">UDP</option>
-->
</select>
</div>
<div class="grid_row_cell" style="width: 25%; padding: 1px;">

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

@ -376,7 +376,9 @@ function ipJsonToPortForwardingTab() {
var ipObj = $midmenuItem1.data("jsonObj");
if(ipObj == null)
return;
var networkObj = $midmenuItem1.data("networkObj");
var ipAddress = ipObj.ipaddress;
if(ipAddress == null || ipAddress.length == 0)
return;
@ -385,6 +387,13 @@ function ipJsonToPortForwardingTab() {
$thisTab.find("#tab_container").hide();
$thisTab.find("#tab_spinning_wheel").show();
if(networkObj.service[0].capability[4].name == "SupportedProtocols") {
var protocols = networkObj.service[0].capability[4].value.toUpperCase(); //e.g. "tcp,udp" => "TCP,UDP"
var array1 = protocols.split(",");
var $protocolField = $("#create_port_forwarding_row").find("#protocol").empty();
for(var i=0; i<array1.length; i++)
$protocolField.append("<option value='"+array1[i]+"'>"+array1[i]+"</option>")
}
refreshCreatePortForwardingRow();
$.ajax({
@ -1232,19 +1241,18 @@ function portForwardingJsonToTemplate(jsonObj, $template) {
});
}
function refreshCreatePortForwardingRow() {
var $createPortForwardingRow = $("#create_port_forwarding_row");
$createPortForwardingRow.find("#public_port").val("");
$createPortForwardingRow.find("#private_port").val("");
$createPortForwardingRow.find("#protocol").val("TCP");
function refreshCreatePortForwardingRow() {
var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");
if($midmenuItem1 == null)
return;
var ipObj = $midmenuItem1.data("jsonObj");
if(ipObj == null)
return;
return;
var $createPortForwardingRow = $("#create_port_forwarding_row");
$createPortForwardingRow.find("#public_port").val("");
$createPortForwardingRow.find("#private_port").val("");
var $vmSelect = $createPortForwardingRow.find("#vm").empty();
ipPopulateVMDropdown($vmSelect);
}