github
/
haproxy-wi
mirror of https://github.com/Aidaho12/haproxy-wi
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #260 from gryffus/master 

Fix Adding LDAP users and server overview page
pull/304/head
Pavel Loginov 2021-02-04 09:40:26 +06:00 committed by GitHub
parent 7c575fe0f8 6596d0b4af
commit f67661c1f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/sql.py
View File

@ -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) VALUES ('%s', '%s', '%s', '%s', '%s', '%s')""" % (user, email, funct.get_hash(password), role, activeuser, group)
else: else:
sql = """INSERT INTO user (username, email, role, ldap_user, activeuser, 'groups') 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: try:
cur.execute(sql) cur.execute(sql)
con.commit() con.commit()

2
app/templates/hapservers.html
View File

@ -227,8 +227,8 @@
{% else %} {% else %}
{{ checkbox(id, title='Enable Auto Start', value='1', desc='Auto Start') }} {{ checkbox(id, title='Enable Auto Start', value='1', desc='Auto Start') }}
{% endif %} {% endif %}
</div>
{% endif %} {% endif %}
</div>
<div class="server-act-links"> <div class="server-act-links">
<a href="/app/config.py?service={{service}}&serv={{s.2}}&showConfig" class="ui-button ui-widget ui-corner-all" title="Open running config">Open</a> <a href="/app/config.py?service={{service}}&serv={{s.2}}&showConfig" class="ui-button ui-widget ui-corner-all" title="Open running config">Open</a>
<a href="/app/config.py?service={{service}}&serv={{s.2}}&showCompare" class="ui-button ui-widget ui-corner-all" title="Compare configs">Compare</a> <a href="/app/config.py?service={{service}}&serv={{s.2}}&showCompare" class="ui-button ui-widget ui-corner-all" title="Compare configs">Compare</a>