deblan/PowerDNS-Admin
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Set LDAP as source if both LDAP and Basic is enabled.

Browse source
This commit is contained in:
Joachim Tingvold 2016-07-05 15:28:02 +00:00
parent ea42c78b9a
commit 9dc3c3ff98
3 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/templates/login.html
View file

@ -63,8 +63,12 @@
<div class="form-group"> <div class="form-group">
<select class="form-control" name="auth_method"> <select class="form-control" name="auth_method">
<option value="LOCAL">LOCAL Authentication</option> <option value="LOCAL">LOCAL Authentication</option>
<option value="LDAP">LDAP Authentication</option> {% if login_ldap_first_setting %}
</select> <option value="LDAP" selected="selected">LDAP Authentication</option>
{% else %}
<option value="LDAP">LDAP Authentication</option>
{% endif %}
</select>
</div> </div>
{% elif ldap_enabled and not basic_enabled %} {% elif ldap_enabled and not basic_enabled %}
<div class="form-group"> <div class="form-group">

5
app/views.py
View file

@ -40,6 +40,11 @@ def inject_record_helper_setting():
record_helper_setting = Setting.query.filter(Setting.name == 'record_helper').first() record_helper_setting = Setting.query.filter(Setting.name == 'record_helper').first()
return dict(record_helper_setting=strtobool(record_helper_setting.value)) return dict(record_helper_setting=strtobool(record_helper_setting.value))
@app.context_processor
def inject_login_ldap_first_setting():
login_ldap_first_setting = Setting.query.filter(Setting.name == 'login_ldap_first').first()
return dict(login_ldap_first_setting=strtobool(login_ldap_first_setting.value))
@app.context_processor @app.context_processor
def inject_default_record_table_size_setting(): def inject_default_record_table_size_setting():
default_record_table_size_setting = Setting.query.filter(Setting.name == 'default_record_table_size').first() default_record_table_size_setting = Setting.query.filter(Setting.name == 'default_record_table_size').first()

2
create_db.py
View file

@ -12,6 +12,7 @@ user_role = Role('User', 'User')
maintenance_setting = Setting('maintenance', 'False') maintenance_setting = Setting('maintenance', 'False')
fullscreen_layout_setting = Setting('fullscreen_layout', 'True') fullscreen_layout_setting = Setting('fullscreen_layout', 'True')
record_helper_setting = Setting('record_helper', 'True') record_helper_setting = Setting('record_helper', 'True')
login_ldap_first_setting = Setting('login_ldap_first', 'True')
default_record_table_size_setting = Setting('default_record_table_size', '15') default_record_table_size_setting = Setting('default_record_table_size', '15')
default_domain_table_size_setting = Setting('default_domain_table_size', '10') default_domain_table_size_setting = Setting('default_domain_table_size', '10')
db.session.add(admin_role) db.session.add(admin_role)
@ -19,6 +20,7 @@ db.session.add(user_role)
db.session.add(maintenance_setting) db.session.add(maintenance_setting)
db.session.add(fullscreen_layout_setting) db.session.add(fullscreen_layout_setting)
db.session.add(record_helper_setting) db.session.add(record_helper_setting)
db.session.add(login_ldap_first_setting)
db.session.add(default_record_table_size_setting) db.session.add(default_record_table_size_setting)
db.session.add(default_domain_table_size_setting) db.session.add(default_domain_table_size_setting)
db.session.commit() db.session.commit()