Pavel Loginov 2021-09-15 14:15:07 +06:00
parent de1649fdfe
commit 18b98edff3
3 changed files with 2 additions and 3 deletions

View File

@ -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:

View File

@ -1,6 +1,5 @@
{% if user %}
<span id="show-user-settings-button" class="menu-bar login" title="User settings" style="margin-top: 7px;cursor: pointer;"></span>
<!-- <a href=/app/login.py?logout=logout title="Logout, user name: {{ user }}" class="login"> Logout</a> -->
<span id="show-user-settings-button" class="menu-bar login" title="User settings for user {{ user }}" style="margin-top: 7px;"></span>
{% else %}
<a href=/app/login.py title="Login" class="login"> Login</a>
{% endif %}