summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Davis <phil.davis@inf.org>2016-06-15 10:45:16 +0930
committerStephen Beaver <sbeaver@netgate.com>2016-06-22 11:45:32 -0400
commit8c5128010599bb9a0083c90eeaa2b7d60135fa26 (patch)
treefadb5ea424004d924d34854cebafdc0530410039
parent4a89ba6158048d7a8c02fba848531c4d72ad765b (diff)
downloadpfsense-8c5128010599bb9a0083c90eeaa2b7d60135fa26.zip
pfsense-8c5128010599bb9a0083c90eeaa2b7d60135fa26.tar.gz
Fix #6482 OpenVPN Redirect Gateway Option Causes GUI Issue
This fixes the GUI inconsistency reported in the referenced bug. On edit of an OpenVPN server that has tun mode, not shared key, and the gwredir checkbox checked, the local_network fields are shown, but actually they should be hidden (because that is what happens on first data entry when gwredir is checked). At least this makes the GUI consistent. Then the other issues mentioned in Redmine feature 6483 can be addressed separately. (cherry picked from commit fa20dac1b58488713d88b44cafc760a83d79cb66)
-rw-r--r--src/usr/local/www/vpn_openvpn_server.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/usr/local/www/vpn_openvpn_server.php b/src/usr/local/www/vpn_openvpn_server.php
index 12a883c..6d44b5d 100644
--- a/src/usr/local/www/vpn_openvpn_server.php
+++ b/src/usr/local/www/vpn_openvpn_server.php
@@ -1497,8 +1497,10 @@ events.push(function() {
hideInput('local_networkv6', true);
hideInput('topology', true);
} else {
- hideInput('local_network', false);
- hideInput('local_networkv6', false);
+ // For tunnel mode that is not shared key,
+ // the display status of local network fields depends on
+ // the state of the gwredir checkbox.
+ gwredir_change();
hideInput('topology', false);
}
break;
OpenPOWER on IntegriCloud