From 7e14145f795b58302357f9c026fe50b34918e683 Mon Sep 17 00:00:00 2001
From: Pavel Loginov <buffoon2001@mail.ru>
Date: Tue, 16 Nov 2021 14:03:43 +0600
Subject: [PATCH] v5.3.3.0

Changelog: https://haproxy-wi.org/changelog.py#5_3_3
---
 app/create_db.py                          | 2 +-
 app/sql.py                                | 1 -
 app/templates/delver.html                 | 3 ++-
 app/templates/include/admin_settings.html | 7 ++++++-
 inc/script.js                             | 9 +++++++++
 5 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/app/create_db.py b/app/create_db.py
index 7c6b6b8f..a5057fae 100644
--- a/app/create_db.py
+++ b/app/create_db.py
@@ -859,7 +859,7 @@ def update_db_v_5_3_2_2(**kwargs):
 
 
 def update_ver():
-	query = Version.update(version='5.3.2.0')
+	query = Version.update(version='5.3.3.0')
 	try:
 		query.execute()
 	except:
diff --git a/app/sql.py b/app/sql.py
index bf7b578e..32b1a30a 100644
--- a/app/sql.py
+++ b/app/sql.py
@@ -2419,7 +2419,6 @@ def insert_port_scanner_history(serv, port, port_status, service_name):
 	try:
 		PortScannerHistory.insert(serv=serv, port=port, status=port_status, service_name=service_name,
 								  date=funct.get_data('regular')).execute()
-		cursor.execute(sql)
 	except Exception as e:
 		out_error(e)
 
diff --git a/app/templates/delver.html b/app/templates/delver.html
index 44999566..c423aa02 100644
--- a/app/templates/delver.html
+++ b/app/templates/delver.html
@@ -12,10 +12,11 @@
 			<input type="hidden" value="{{service}}" name="service" id="service">
 			{% include 'include/select.html' %}
 				<a class="ui-button ui-widget ui-corner-all" title="View stat" onclick="showListOfVersion(1)">Open</a>
+				<a href="config.py?service={{service}}" class="ui-button ui-widget ui-corner-all" title="Configs page">Configs</a>
 			{% if service != 'keepalived' %}
-				<a href="config.py" class="ui-button ui-widget ui-corner-all" title="Configs page">Configs</a>
 				<a class="ui-button ui-widget ui-corner-all" title="View stat" onclick="openStats()">Stat</a>
 			{% endif %}
+			<a class="ui-button ui-widget ui-corner-all" title="Change version" onclick="changeVersion()">Change version</a>
 		</form>
 	</p>
 	{% if aftersave %}
diff --git a/app/templates/include/admin_settings.html b/app/templates/include/admin_settings.html
index e146c748..e5c0975c 100644
--- a/app/templates/include/admin_settings.html
+++ b/app/templates/include/admin_settings.html
@@ -2,6 +2,9 @@
     <tbody>
         {% set section = namespace(section='') %}
         {% for set in settings %}
+        {% if page == "servers.py" and set.section == 'monitoring' %}
+        <!-- continue -->
+        {% else %}
         {% if section.section|string() != set.section|string() %}
         <th colspan="3" title="Show {{ set.section }} section" id="{{set.section}}-section-head" style="cursor: pointer; padding-top: 10px;">
             <h3 class="plus-after" id="{{set.section}}-section-h3" style="font-size: 1em; padding-left: 15px;">
@@ -36,7 +39,8 @@
 					set.param == 'syslog_server_enable' or set.param == 'smon_check_interval' or
 					set.param == 'checker_check_interval' or set.param == 'port_scan_interval' or
 					set.param == 'smon_keep_history_range' or set.param == 'checker_keep_history_range' or
-					set.param == 'portscanner_keep_history_range' or set.param == 'haproxy_enterprise' %}
+					set.param == 'portscanner_keep_history_range' or set.param == 'haproxy_enterprise' or
+                    set.param == 'checker_maxconn_threshold' %}
 
                     {{ input(set.param, value=set.value, style='width: 210px;', type='number') }}
                 {% else %}
@@ -51,6 +55,7 @@
                 {{set.desc}}
             </td>
         </tr>
+        {% endif %}
         {% endfor %}
     </tbody>
 </table>
\ No newline at end of file
diff --git a/inc/script.js b/inc/script.js
index a92f5fc8..b8aeb5b4 100644
--- a/inc/script.js
+++ b/inc/script.js
@@ -529,6 +529,15 @@ function showListOfVersion(for_delver) {
 		}
 	} );
 }
+function changeVersion(){
+	if (localStorage.getItem('version_style') == 'new') {
+		localStorage.setItem('version_style', 'old');
+		showListOfVersion(1);
+	} else {
+		localStorage.setItem('version_style', 'new');
+		showListOfVersion(1);
+	}
+}
 function findGetParameter(parameterName) {
     var result = null,
         tmp = [];