Merge branch 'PowerDNS-Admin:master' into setup-new-wiki-docs-2

This commit is contained in:
David Mc Ken 2022-12-09 06:49:18 -04:00 committed by GitHub
commit 92ef3d8610
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions

View File

@ -1,6 +1,6 @@
{% extends "base.html" %} {% extends "base.html" %}
{% set active_page = "admin_keys" %} {% set active_page = "admin_keys" %}
{% if create or (key is not none and key.role.name != "User") %}{% set hide_opts = True %}{%else %}{% set hide_opts = False %}{% endif %} {% if (key is not none and key.role.name != "User") %}{% set hide_opts = True %}{%else %}{% set hide_opts = False %}{% endif %}
{% block title %} {% block title %}
<title>Edit Key - {{ SITE_NAME }}</title> <title>Edit Key - {{ SITE_NAME }}</title>
{% endblock %} {% endblock %}
@ -39,7 +39,9 @@
<select class="key_role form-control" id="key_role" name="key_role"> <select class="key_role form-control" id="key_role" name="key_role">
{% for role in roles %} {% for role in roles %}
<option value="{{ role.name }}" <option value="{{ role.name }}"
{% if (key is not none) and (role.id==key.role.id) %}selected{% endif %}>{{ role.name }}</option> {% if (key is not none) and (role.id==key.role.id) %}selected{% endif %}
{% if (key is none) and (role.name=="User") %}selected{% endif %}
>{{ role.name }}</option>
{% endfor %} {% endfor %}
</select> </select>
</div> </div>

View File

@ -8,7 +8,7 @@ mysqlclient==2.0.1
configobj==5.0.6 configobj==5.0.6
bcrypt>=3.1.7 bcrypt>=3.1.7
requests==2.24.0 requests==2.24.0
python-ldap==3.4.0 python-ldap==3.4.2
pyotp==2.4.0 pyotp==2.4.0
qrcode==6.1 qrcode==6.1
dnspython>=1.16.0 dnspython>=1.16.0