Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 23:14:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix ip-only in DS settings to show port instead of address

Browse source
This commit is contained in:
Ryan Huffman 2017-10-28 12:19:06 -07:00 committed by Atlante45
parent 88e22f7507
commit 3616ef7c49
1 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
domain-server/resources/web/settings/js/settings.js
View file

@ -725,11 +725,12 @@ function setupDomainNetworkingSettings() {
return; return;
} }
var includePort = autoNetworkingSetting === 'disabled'; var includeAddress = autoNetworkingSetting === 'disabled';
var label = "Network Address"; if (includeAddress) {
if (includePort) { var label = "Network Address and Port";
label += " and Port"; } else {
var label = "Network Port";
} }
var lowerName = name.toLowerCase(); var lowerName = name.toLowerCase();
@ -748,14 +749,14 @@ function setupDomainNetworkingSettings() {
var address = DomainInfo.network_address === null ? '' : DomainInfo.network_address; var address = DomainInfo.network_address === null ? '' : DomainInfo.network_address;
var port = DomainInfo.network_port === null ? '' : DomainInfo.network_port; var port = DomainInfo.network_port === null ? '' : DomainInfo.network_port;
var modal_body = "<div class='form-group'>"; var modal_body = "<div class='form-group'>";
modal_body += "<label class='control-label'>Address</label>"; if (includeAddress) {
modal_body += "<input type='text' id='network-address-input' class='form-control' value='" + address + "'>"; modal_body += "<label class='control-label'>Address</label>";
modal_body += "<div id='network-address-error' class='error-message' data-property='network_address'></div>"; modal_body += "<input type='text' id='network-address-input' class='form-control' value='" + address + "'>";
if (includePort) { modal_body += "<div id='network-address-error' class='error-message' data-property='network_address'></div>";
modal_body += "<label class='control-label'>Port</label>";
modal_body += "<input type='text' id='network-port-input' class='form-control' value='" + port + "'>";
modal_body += "<div id='network-port-error' class='error-message' data-property='network_port'></div>";
} }
modal_body += "<label class='control-label'>Port</label>";
modal_body += "<input type='text' id='network-port-input' class='form-control' value='" + port + "'>";
modal_body += "<div id='network-port-error' class='error-message' data-property='network_port'></div>";
modal_body += "</div>"; modal_body += "</div>";
var dialog = bootbox.dialog({ var dialog = bootbox.dialog({
@ -775,10 +776,10 @@ function setupDomainNetworkingSettings() {
className: 'edit-network-save-btn btn btn-primary', className: 'edit-network-save-btn btn btn-primary',
callback: function() { callback: function() {
var data = { var data = {
network_address: $('#network-address-input').val() network_port: $('#network-port-input').val()
}; };
if (includePort) { if (includeAddress) {
data.network_port = $('#network-port-input').val(); data.network_address = $('#network-address-input').val();
} }
$('.edit-network-cancel-btn').attr('disabled', 'disabled'); $('.edit-network-cancel-btn').attr('disabled', 'disabled');
@ -829,10 +830,10 @@ function setupDomainNetworkingSettings() {
var spinner = createDomainSpinner(); var spinner = createDomainSpinner();
var errorMessage = '' var errorMessage = ''
if (includePort) { if (includeAddress) {
errorMessage = "We were unable to load the network address and port."; errorMessage = "We were unable to load the network address and port.";
} else { } else {
errorMessage = "We were unable to load the network address." errorMessage = "We were unable to load the network port."
} }
var errorEl = createDomainLoadingError(errorMessage); var errorEl = createDomainLoadingError(errorMessage);
@ -1015,7 +1016,7 @@ function reloadDomainInfo() {
if (autoNetworkingSetting === 'disabled') { if (autoNetworkingSetting === 'disabled') {
$('#network-address-port input').val(address + ":" + port); $('#network-address-port input').val(address + ":" + port);
} else if (autoNetworkingSetting === 'ip') { } else if (autoNetworkingSetting === 'ip') {
$('#network-address-port input').val(address); $('#network-address-port input').val(port);
} }
appendAddButtonToPlacesTable(); appendAddButtonToPlacesTable();