aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorPiBa-NL <pba_2k3@yahoo.com>2014-04-07 23:25:35 +0200
committerPiBa-NL <pba_2k3@yahoo.com>2014-04-07 23:25:35 +0200
commit1475d404bace06ae776f06834123f67a980d2a0f (patch)
treedcadb7ebda1f4a6b106a4bc8b764c6b1600b643c /config
parentf9b4780bec0f2994c93c8cdac5c7646a9b5b6a84 (diff)
downloadpfsense-packages-1475d404bace06ae776f06834123f67a980d2a0f.tar.gz
pfsense-packages-1475d404bace06ae776f06834123f67a980d2a0f.tar.bz2
pfsense-packages-1475d404bace06ae776f06834123f67a980d2a0f.zip
haproxy-devel, fix showing wrong type of acl's when the primary frontend switched
Diffstat (limited to 'config')
-rw-r--r--config/haproxy-devel/haproxy_listeners_edit.php15
1 files changed, 11 insertions, 4 deletions
diff --git a/config/haproxy-devel/haproxy_listeners_edit.php b/config/haproxy-devel/haproxy_listeners_edit.php
index 5bc039b7..884bb364 100644
--- a/config/haproxy-devel/haproxy_listeners_edit.php
+++ b/config/haproxy-devel/haproxy_listeners_edit.php
@@ -261,7 +261,14 @@ $interfaces = haproxy_get_bindable_interfaces();
function htmllist_get_select_options(tableId) {
var seltext;
seltext = "";
- var type = d.getElementById("type").value;
+ var type;
+ var secondary = d.getElementById("secondary");
+ var primary_frontend = d.getElementById("primary_frontend");
+ if ((secondary !== null) && (secondary.checked))
+ type = primaryfrontends[primary_frontend.value]['ref']['type'];
+ else
+ type = d.getElementById("type").value;
+
if (tableId == 'tableA_acltable'){
if (type == 'health')
seltext = "<?php echo haproxy_js_acl_select('health');?>";
@@ -297,10 +304,10 @@ $interfaces = haproxy_get_bindable_interfaces();
function updatevisibility() {
d = document;
ssloffload = d.getElementById("ssloffload");
- type = d.getElementById("type");
- secondary = d.getElementById("secondary");
- primary_frontend = d.getElementById("primary_frontend");
+ var type;
+ var secondary = d.getElementById("secondary");
+ var primary_frontend = d.getElementById("primary_frontend");
if ((secondary !== null) && (secondary.checked))
type = primaryfrontends[primary_frontend.value]['ref']['type'];
else