From 698c0bf6ee1b9008167dbf85f3146a802eab11fd Mon Sep 17 00:00:00 2001
From: Pavel Loginov <buffoon2001@mail.ru>
Date: Thu, 7 May 2020 22:59:25 +0200
Subject: [PATCH] v4.2.3.0

Changelog: https://haproxy-wi.org/changelog.py#4_2_3
---
 api/api.py                          |  1 -
 app/templates/ajax/overivewWaf.html | 14 ++++++++++----
 inc/waf.js                          |  8 +-------
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/api/api.py b/api/api.py
index aadff4e5..e565ec76 100644
--- a/api/api.py
+++ b/api/api.py
@@ -89,7 +89,6 @@ def get_servers():
 				'id':s[0],
 				'hostname':s[1],
 				'ip':s[2],
-				'group':s[3],
 				'virt':s[4],
 				'enable':s[5],
 				'is_master':s[6],
diff --git a/app/templates/ajax/overivewWaf.html b/app/templates/ajax/overivewWaf.html
index 3b1d7db7..419e9010 100644
--- a/app/templates/ajax/overivewWaf.html
+++ b/app/templates/ajax/overivewWaf.html
@@ -46,12 +46,12 @@
 				{{ service.3 }}
 			{% endif %}
 			</td>
-			<td style="padding-top: 2px;">
+			<td style="padding-top: 2px;" class="ajaxwafstatus">
 				{% if service.3 == "On" or service.3 == "Off" or service.3 == "DetectionOnly" %}
 					{% if service.4|int() == 1 %}
-						<label for="{{ service.0 }}"></label><input type="checkbox" id="{{ service.0 }}" checked>
+						<label for="metrics{{ service.0 }}"></label><input type="checkbox" id="metrics{{ service.0 }}" checked />
 					{% else %}
-						<label for="{{ service.0 }}"></label><input type="checkbox" id="{{ service.0 }}">
+						<label for="metrics{{ service.0 }}"></label><input type="checkbox" id="metrics{{ service.0 }}" />
 					{% endif %}
 				{% endif %}
 			</td>
@@ -68,12 +68,18 @@
 	{% endif %}
 {% endfor %}
 <script>
-	$( "select" ).selectmenu();
 	{% if role <= 1 %}
+		$( "select" ).selectmenu();
+		$( "input[type=checkbox]" ).checkboxradio();
 		$( "select" ).on('selectmenuchange',function() {
 			var id = $(this).attr('id');
 			changeWafMode(id)
 		});	
+		$( ".ajaxwafstatus input" ).change(function() {
+			var id = $(this).attr('id');
+			console.log(id)
+			metrics_waf(id);
+		});
 	{% endif %}
 </script>
 <style>
diff --git a/inc/waf.js b/inc/waf.js
index f929d752..6c9ec0d1 100644
--- a/inc/waf.js
+++ b/inc/waf.js
@@ -1,11 +1,4 @@
 var awesome = "/inc/fontawesome.min.js"
-
-$( function() {
-	$( "#ajaxwafstatus input" ).change(function() {
-		var id = $(this).attr('id');
-		metrics_waf(id);
-	});
-} );
 function showOverviewWaf(serv, hostnamea) {
 	$.getScript('/inc/chart.min.js');
 	showWafMetrics();
@@ -43,6 +36,7 @@ function metrics_waf(name) {
 	if ($('#'+name).is(':checked')) {
 		enable = '1';
 	}
+	name = name.split('metrics')[1]
 	$.ajax( {
 		url: "options.py",
 		data: {