aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2014-01-21 09:43:50 -0500
committerjim-p <jimp@pfsense.org>2014-01-21 09:43:50 -0500
commitd24903fbce5d38299b2e01a3d34d8d002fcc698d (patch)
tree9a929948fade3ec3e8f56040fad150d761ee54e6
parent9c277bf31b361546080ba3e66b977cf6465e7938 (diff)
downloadpfsense-packages-d24903fbce5d38299b2e01a3d34d8d002fcc698d.tar.gz
pfsense-packages-d24903fbce5d38299b2e01a3d34d8d002fcc698d.tar.bz2
pfsense-packages-d24903fbce5d38299b2e01a3d34d8d002fcc698d.zip
Small JS fix for haproxy-devel, fix version & bump slightly.
-rw-r--r--config/haproxy-devel/haproxy_listeners_edit.php8
-rw-r--r--pkg_config.10.xml2
-rw-r--r--pkg_config.8.xml2
-rw-r--r--pkg_config.8.xml.amd642
4 files changed, 8 insertions, 6 deletions
diff --git a/config/haproxy-devel/haproxy_listeners_edit.php b/config/haproxy-devel/haproxy_listeners_edit.php
index 2fd9a6c3..3c62ec3a 100644
--- a/config/haproxy-devel/haproxy_listeners_edit.php
+++ b/config/haproxy-devel/haproxy_listeners_edit.php
@@ -299,15 +299,17 @@ $interfaces = haproxy_get_bindable_interfaces();
secondary = d.getElementById("secondary");
primary_frontend = d.getElementById("primary_frontend");
- if (secondary.checked)
+ if ((secondary !== null) && (secondary.checked))
type = primaryfrontends[primary_frontend.value]['ref']['type'];
else
type = d.getElementById("type").value;
setCSSdisplay(".haproxy_ssloffloading_enabled", ssloffload.checked);
setCSSdisplay(".haproxy_mode_http", type == "http");
- setCSSdisplay(".haproxy_primary", !secondary.checked);
- setCSSdisplay(".haproxy_secondary", secondary.checked);
+ if (secondary !== null) {
+ setCSSdisplay(".haproxy_primary", !secondary.checked);
+ setCSSdisplay(".haproxy_secondary", secondary.checked);
+ }
type_change(type);
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 9a664e3e..dd443fff 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -183,7 +183,7 @@
Supports acl's for smart backend switching.]]></descr>
<website>http://haproxy.1wt.eu/</website>
<category>Services</category>
- <version>1.5-dev19 pkg v 0.6</version>
+ <version>1.5-dev21 pkg v 0.6.1</version>
<status>Release</status>
<required_version>2.2</required_version>
<config_file>http://www.pfsense.com/packages/config/haproxy-devel/haproxy.xml</config_file>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 2f3a0322..0e40dfb2 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -192,7 +192,7 @@
Supports acl's for smart backend switching.]]></descr>
<website>http://haproxy.1wt.eu/</website>
<category>Services</category>
- <version>1.5-dev19 pkg v 0.6</version>
+ <version>1.5-dev21 pkg v 0.6.1</version>
<status>Release</status>
<required_version>2.1</required_version>
<config_file>http://www.pfsense.com/packages/config/haproxy-devel/haproxy.xml</config_file>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 36df7ab2..6454a58e 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -179,7 +179,7 @@
Supports acl's for smart backend switching.]]></descr>
<website>http://haproxy.1wt.eu/</website>
<category>Services</category>
- <version>1.5-dev19 pkg v 0.6</version>
+ <version>1.5-dev21 pkg v 0.6.1</version>
<status>Release</status>
<required_version>2.1</required_version>
<config_file>http://www.pfsense.com/packages/config/haproxy-devel/haproxy.xml</config_file>