From d24903fbce5d38299b2e01a3d34d8d002fcc698d Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Tue, 21 Jan 2014 09:43:50 -0500
Subject: Small JS fix for haproxy-devel, fix version & bump slightly.

---
 config/haproxy-devel/haproxy_listeners_edit.php | 8 +++++---
 pkg_config.10.xml                               | 2 +-
 pkg_config.8.xml                                | 2 +-
 pkg_config.8.xml.amd64                          | 2 +-
 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>
-- 
cgit v1.2.3