From 18b98edff3dd1da2b90ce788fc883487243f9d05 Mon Sep 17 00:00:00 2001 From: Pavel Loginov Date: Wed, 15 Sep 2021 14:15:07 +0600 Subject: [PATCH] v5.2.6.0 Changelog: https://haproxy-wi.org/changelog.py#5_2_6 --- app/options.py | 2 +- app/templates/include/geoip_select.html | 0 app/templates/include/login.html | 3 +-- 3 files changed, 2 insertions(+), 3 deletions(-) delete mode 100644 app/templates/include/geoip_select.html diff --git a/app/options.py b/app/options.py index ba6e32c9..47e7d03f 100644 --- a/app/options.py +++ b/app/options.py @@ -410,7 +410,7 @@ if form.getvalue('action_hap') is not None and serv is not None: servers = sql.select_servers(server=serv) for server in servers: server_id = server[0] - haproxy_enterprise = sql.select_service_setting(serv, 'haproxy', 'haproxy_enterprise') + haproxy_enterprise = sql.select_service_setting(server_id, 'haproxy', 'haproxy_enterprise') if haproxy_enterprise == '1': haproxy_service_name = "hapee-2.0-lb" else: diff --git a/app/templates/include/geoip_select.html b/app/templates/include/geoip_select.html deleted file mode 100644 index e69de29b..00000000 diff --git a/app/templates/include/login.html b/app/templates/include/login.html index 760063fa..bb70b0ad 100644 --- a/app/templates/include/login.html +++ b/app/templates/include/login.html @@ -1,6 +1,5 @@ {% if user %} - - + {% else %} Login {% endif %} \ No newline at end of file