Module: check_mk Branch: master Commit: e83a815398a631158492453ec5044b5e53d2279b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e83a815398a631… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Sep 20 14:14:32 2013 +0200 Moved LDAP-Settings button to users page --- .bugs/953 | 10 ++++++++++ web/htdocs/wato.py | 5 +++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.bugs/953 b/.bugs/953 new file mode 100644 index 0000000..5430ba2 --- /dev/null +++ b/.bugs/953 @@ -0,0 +1,10 @@ +Title: Move LDAP-Settings button to user management +Component: multisite +Class: nastiness +State: done +Date: 2013-09-20 13:58:50 +Targetversion: 1.4.0 + +Currently it's in the global settings + +2013-09-20 14:14:22: changed state open -> done diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d743b89..7cde566 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5436,6 +5436,7 @@ def mode_ldap_config(phase): elif phase == 'buttons': global_buttons() + html.context_button(_("Users"), make_link([("mode", "users")]), "users") return config_vars = [ @@ -5598,8 +5599,6 @@ def mode_globalvars(phase): elif phase == "buttons": global_buttons() - if userdb.connector_enabled('ldap'): - html.context_button(_("LDAP Settings"), make_link([("mode", "ldap_config")]), "ldap") return # Get default settings of all configuration variables of interest in the domain @@ -8164,6 +8163,8 @@ def mode_users(phase): html.context_button(_("Sync Users"), html.makeactionuri([("_sync", 1)]), "replicate") if config.may("general.notify"): html.context_button(_("Notify Users"), 'notify.py', "notification") + if userdb.connector_enabled('ldap'): + html.context_button(_("LDAP Settings"), make_link([("mode", "ldap_config")]), "ldap") return # Execute all connectors synchronisations of users. This must be done before