5 Dec
2011
5 Dec
'11
2:28 p.m.
Module: check_mk
Branch: master
Commit: 5c6e80752523a031dfdd845b35d57b68017cd471
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c6e80752523a0…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Dec 5 15:28:43 2011 +0100
Language of user is now configurable by admin; Added users-saved hook
---
web/htdocs/lib.py | 15 ++++++++
web/htdocs/login.py | 19 +---------
web/htdocs/wato.py | 35 ++++++++++++++++++++
web/plugins/views/nagvis.py | 76 +++++++++++++++++++++++++++++++++++++++++++
4 files changed, 128 insertions(+), 17 deletions(-)
diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py
index 688470a..92bd4e9 100644
--- a/web/htdocs/lib.py
+++ b/web/htdocs/lib.py
@@ -117,6 +117,21 @@ def load_web_plugins(forwhat, globalvars):
if fn.endswith(".py"):
execfile(local_plugins_path + "/" + fn, globalvars)
+def get_languages():
+ languages = []
+ dirs = [ defaults.locale_dir ]
+ if defaults.omd_root:
+ dirs.append(defaults.omd_root + "/local/share/check_mk/locale")
+
+ for lang_dir in dirs:
+ try:
+ languages += [ (val, val) for val in os.listdir(lang_dir) if not '.'
in val ]
+ except OSError:
+ # Catch "OSError: [Errno 2] No such file or directory:" when
directory not exists
+ pass
+
+ return languages
+
def pnp_cleanup(s):
return s \
.replace(' ', '_') \
diff --git a/web/htdocs/login.py b/web/htdocs/login.py
index a8b1185..629dbc5 100644
--- a/web/htdocs/login.py
+++ b/web/htdocs/login.py
@@ -248,21 +248,6 @@ def page_logout():
html.set_http_header('Location', defaults.url_prefix +
'check_mk/')
raise apache.SERVER_RETURN, apache.HTTP_MOVED_TEMPORARILY
-def get_languages():
- languages = []
- dirs = [ defaults.locale_dir ]
- if defaults.omd_root:
- dirs.append(defaults.omd_root + "/local/share/check_mk/locale")
-
- for lang_dir in dirs:
- try:
- languages += [ (val, val) for val in os.listdir(lang_dir) if not '.'
in val ]
- except OSError:
- # Catch "OSError: [Errno 2] No such file or directory:" when
directory not exists
- pass
-
- return languages
-
def page_edit_profile():
html.header(_("Edit user profile"))
@@ -282,7 +267,7 @@ def page_edit_profile():
#
if config.may('edit_profile'):
# Set the users language if requested
- language = html.var('lang')
+ language = html.var('language')
if language and language != config.get_language():
# Set custom language
users[config.user_id]['language'] = language
@@ -332,7 +317,7 @@ def page_edit_profile():
html.write("</td><td class=content>")
default_label = _('Default (%s)') % config.default_language
languages = [ ('', default_label) ] + languages
- html.select("lang", languages, config.get_language(default_label))
+ html.select("language", languages,
config.get_language(default_label))
html.set_focus("lang")
html.write("</td></tr>")
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index fd51453..ffab9ae 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -7223,6 +7223,14 @@ def mode_edit_user(phase):
# Roles
new_user["roles"] = filter(lambda role:
html.get_checkbox("role_" + role),
roles.keys())
+
+ # Language configuration
+ language = html.var('language')
+ if language and language != config.default_language:
+ new_user['language'] = language
+ elif not language and 'language' in new_user:
+ del new_user['language']
+
# Contact groups
cgs = []
for c in contact_groups:
@@ -7427,6 +7435,18 @@ def mode_edit_user(phase):
html.write("</ul>")
html.write("</td></tr>")
+ languages = get_languages()
+ if languages:
+ html.write("<tr><td class=legend>")
+ html.write(_("Language") + _('<br><i>Configure the
default language '
+ 'to be used in the multisite GUI.</i>'))
+ html.write("</td><td class=content>")
+ default_label = _('Default (%s)') % config.default_language
+ languages = [ ('', default_label) ] + languages
+ html.select("language", languages, config.get_language(default_label))
+ html.write("</td></tr>")
+
+
# TODO: Later we could add custom macros here, which
# then could be used for notifications. On the other hand,
# if we implement some check_mk --notify, we could directly
@@ -7588,6 +7608,15 @@ def save_users(profiles):
elif os.path.exists(auth_file):
os.remove(auth_file)
+ # Call the users_saved hook
+ try:
+ call_hook_users_saved()
+ except Exception, e:
+ if config.debug:
+ raise
+ else:
+ raise MKUserError(None, "Error executing hooks: %s" % str(e))
+
#.
# .-Roles----------------------------------------------------------------.
# | ____ _ |
@@ -9832,6 +9861,12 @@ def call_hook_activate_changes():
if hook_registered('activate-changes'):
call_hooks("activate-changes", collect_hosts(g_root_folder))
+# This hook is executed when the save_users() function is called
+def call_hook_users_saved():
+ if hook_registered('users-saved'):
+ call_hooks("users-saved")
+
+
#.
# .-Helpers--------------------------------------------------------------.
# | _ _ _ |
diff --git a/web/plugins/views/nagvis.py b/web/plugins/views/nagvis.py
new file mode 100644
index 0000000..d001fb7
--- /dev/null
+++ b/web/plugins/views/nagvis.py
@@ -0,0 +1,76 @@
+#!/usr/bin/python
+# -*- encoding: utf-8; py-indent-offset: 4 -*-
+# +------------------------------------------------------------------+
+# | ____ _ _ __ __ _ __ |
+# | / ___| |__ ___ ___| | __ | \/ | |/ / |
+# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / |
+# | | |___| | | | __/ (__| < | | | | . \ |
+# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ |
+# | |
+# | Copyright Mathias Kettner 2010 mk(a)mathias-kettner.de |
+# +------------------------------------------------------------------+
+#
+# This file is part of Check_MK.
+# The official homepage is at http://mathias-kettner.de/check_mk.
+#
+# check_mk is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation in version 2. check_mk is distributed
+# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with-
+# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE. See the GNU General Public License for more de-
+# ails. You should have received a copy of the GNU General Public
+# License along with GNU Make; see the file COPYING. If not, write
+# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301 USA.
+
+# Vorgehen:
+#
+# Es gibt eine Sektion mit NagVis spezifischen Berechtigungen. Die meißten NagVis
+# internen Rechte wirken implizit.
+#
+# Im Multisite gibt es zwei Wege Nutzer zu berechtigen. Zunächst können pro Rolle
+# die allgemeinen Rechte gesetzt werden. Das ist z.B. Full Access auf alles.
+#
+# Dann gibt es noch die Berechtigungen, die sich auf die WATO Folder Maps beziehen.
+# Wir nehmn dazu einfach die Berechtigungen, die eh schon auf dem Folder liegen.
+# Im Folder sind die Contactgroups definiert. Aus diesen wird dann die Berechtigung
+# auf dem Folder abgeleitet.
+#
+# Auf WATO Ebene bedeutet die Zuordnung eine Contactgroup, dass diese Nutzer die
+# Hosts via WATO editieren können. Also kann man daraus auch ableten, dass diese
+# Nutzer die Maps in diesem Folder editieren dürfen.
+#
+# Wie werden die Anzeige-Berechtigungen geregelt?
+
+config.declare_permission_section('nagvis', _('NagVis'))
+
+config.declare_permission(
+ 'nagvis.*_*_*',
+ _('Full access'),
+ _('This permission grants full access to NagVis.'),
+ [ 'admin' ]
+)
+
+config.declare_permission(
+ 'nagvis.Map_view_*',
+ _('View all maps'),
+ _('Grants read access to all maps.'),
+ [ 'guest' ]
+)
+
+config.declare_permission(
+ 'nagvis.Map_edit_*',
+ _('Edit all maps'),
+ _('Grants modify access to all maps.'),
+ []
+)
+
+config.declare_permission(
+ 'nagvis.Map_delete_*',
+ _('Delete all maps'),
+ _('Permits to delete all maps.'),
+ []
+)
+
+# FIXME: Weitere permissions ergänzen