From 03d86367dc8824b0af67e27a3eddd37669f5878f Mon Sep 17 00:00:00 2001 From: Pavel Loginov Date: Tue, 11 Aug 2020 15:29:52 +0200 Subject: [PATCH] v4.4.2.0 Changelog: https://haproxy-wi.org/changelog.py#4_4_2 --- app/create_db.py | 2 +- app/login.py | 2 +- app/sql.py | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/create_db.py b/app/create_db.py index d7647226..6591c4e2 100644 --- a/app/create_db.py +++ b/app/create_db.py @@ -533,7 +533,7 @@ def update_db_v_4_3_2(**kwargs): con.commit() except sqltool.Error as e: if kwargs.get('silent') != 1: - if e.args[0] == 'column param is not unique' or e == " 1060 (42S21): column param is not unique ": + if e.args[0] == 'columns param, group are not unique' or e == " 1060 (42S21): columns param, group are not unique ": print('DB was update to 4.3.2') else: print("An error occurred:", e) diff --git a/app/login.py b/app/login.py index 3995a9db..10649f61 100644 --- a/app/login.py +++ b/app/login.py @@ -37,7 +37,7 @@ def send_cookie(login): cookie = http.cookies.SimpleCookie(os.environ.get("HTTP_COOKIE")) user_group_id = cookie.get('group') user_group_id = user_group_id.value - if sql.select_user_groups(id=id,check_id=user_group_id): + if sql.check_user_group(id,user_group_id): user_groups = user_group_id else: user_groups = sql.select_user_groups(id, limit=1) diff --git a/app/sql.py b/app/sql.py index 71eb33ee..0257f564 100644 --- a/app/sql.py +++ b/app/sql.py @@ -205,6 +205,7 @@ def add_setting_for_new_group(group_id): sql.append("INSERT INTO settings (param, value, section, `desc`, `group`) values('ldap_class_search', 'user', 'ldap', 'Class to search user', " + group_id + ");") sql.append("INSERT INTO settings (param, value, section, `desc`, `group`) values('ldap_user_attribute', 'sAMAccountName', 'ldap', 'User attribute for search', " + group_id + ");") sql.append("INSERT INTO settings (param, value, section, `desc`, `group`) values('ldap_search_field', 'mail', 'ldap', 'Field where user e-mail saved', " + group_id + ");") + sql.append("INSERT INTO settings (param, value, section, `desc`, `group`) values('ldap_type', '0', 'ldap', 'If 0 then will be used LDAP, if 1 then will be used LDAPS ', " + group_id + ");") for i in sql: try: