[checkmk-commits] Check_MK Git: check_mk: FIX LDAP: The LDAP Settings dialog is now disabled when the LDAP Connector is disabled

Module: check_mk Branch: master Commit: 7e48f19d8662011e852a3e61b9fa70c47c4ee277 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e48f19d866201… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 19 14:30:22 2013 +0100 FIX LDAP: The LDAP Settings dialog is now disabled when the LDAP Connector is disabled --- .werks/415 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 5 +++++ 3 files changed, 16 insertions(+) diff --git a/.werks/415 b/.werks/415 new file mode 100644 index 0000000..4c9ee3b --- /dev/null +++ b/.werks/415 @@ -0,0 +1,10 @@ +Title: LDAP: The LDAP Settings dialog is now disabled when the LDAP Connector is disabled +Level: 1 +Component: wato +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387459797 +Targetversion: future + + diff --git a/ChangeLog b/ChangeLog index ef1e953..8bf8c56 100644 --- a/ChangeLog +++ b/ChangeLog @@ -114,6 +114,7 @@ * 0389 FIX: Showing LDAP settings on site specific global settings page now... * 0400 FIX: WATO BI editor now supports percentages for count_ok... * 0392 FIX: LDAP: Improved error messages of LDAP configuration test... + * 0415 FIX: LDAP: The LDAP Settings dialog is now disabled when the LDAP Connector is disabled Notifications: * 0362 sms: now searching PATH for sendsms and smssend commands... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c896f93..2a37ef0 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6032,6 +6032,11 @@ def mode_ldap_config(phase): current_settings = load_configuration_settings() + if not userdb.connector_enabled('ldap'): + html.message(_('The LDAP user connector is disabled. You need to enable it to be able ' + 'to configure the LDAP settings.')) + return + if phase == 'action': if not html.check_transaction(): return