From 706c2d6d6524051fb69940bc17bc9864289ebcc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Krejza?= Date: Thu, 4 Feb 2021 02:52:08 +0100 Subject: [PATCH 1/2] Fix adding LDAP users Use correct parameters when inserting into user database --- app/sql.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/sql.py b/app/sql.py index 35581439..f111fb5c 100644 --- a/app/sql.py +++ b/app/sql.py @@ -38,7 +38,7 @@ def add_user(user, email, password, role, activeuser, group): VALUES ('%s', '%s', '%s', '%s', '%s', '%s')""" % (user, email, funct.get_hash(password), role, activeuser, group) else: sql = """INSERT INTO user (username, email, role, ldap_user, activeuser, 'groups') - VALUES ('%s', '%s', '%s', '1', '%s')""" % (user, email, role, activeuser, group) + VALUES ('%s', '%s', '%s', '1', '%s', '%s')""" % (user, email, role, activeuser, group) try: cur.execute(sql) con.commit() From 6596d0b4af965c5c449449f941a88912f715ec74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Krejza?= Date: Thu, 4 Feb 2021 03:03:11 +0100 Subject: [PATCH 2/2] Fix server details overview layout Fixes
overlapping, that was causing garbled layout of server details page. Root cause was incorrect endif. --- app/templates/hapservers.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/hapservers.html b/app/templates/hapservers.html index f2fc06b6..af690e86 100644 --- a/app/templates/hapservers.html +++ b/app/templates/hapservers.html @@ -227,8 +227,8 @@ {% else %} {{ checkbox(id, title='Enable Auto Start', value='1', desc='Auto Start') }} {% endif %} + {% endif %}
- {% endif %}
Open Compare