Module: check_mk
Branch: master
Commit: 082491e4f0fe4451c911dbce2510b56e08ccf697
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=082491e4f0fe44…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Jan 19 08:48:06 2012 +0100
FIX: Fixed wrong folder contacgroup related permissions in auth.php api
---
ChangeLog | 1 +
web/htdocs/wato.py | 8 ++++++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 1673ec2..b448b08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -61,6 +61,7 @@
* FIX: Fixed problem with duplicate permissions when using the i18n of multiisite
* FIX: Writing single host_contactgroups rules for each selected
contactgroup in host edit dialog
+ * FIX: Fixed wrong folder contacgroup related permissions in auth.php api
BI:
* improve doc/treasures/check_bi_local.py: local check that creates
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index ab0afa8..3d9375e 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -897,6 +897,7 @@ def get_folder_permissions_of_users(users):
permissions = {}
+ users = load_users()
for username in users.iterkeys():
permissions[username] = {}
for folder_path, folder in folders.iteritems():
@@ -922,12 +923,15 @@ def check_folder_permissions(folder, how, exception=True, user = None):
effective = effective_attributes(None, folder)
use, cgs = effective.get("contactgroups", (None, []))
+ if not user:
+ user = config.user_id
+
# Get contact groups of user
users = load_users()
- if config.user_id not in users:
+ if user not in users:
user_cgs = []
else:
- user_cgs = users[config.user_id].get("contactgroups", [])
+ user_cgs = users[user].get("contactgroups", [])
for c in user_cgs:
if c in cgs:
Module: check_mk
Branch: master
Commit: 393c88fd3c0b78b54e091cdfaf5a49609a1278b5
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=393c88fd3c0b78…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Jan 19 08:26:22 2012 +0100
Fixed some typos
---
web/htdocs/wato.py | 4 ++--
web/plugins/wato/check_parameters.py | 2 +-
web/plugins/wato/globals_notification.py | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index c2286a9..ab0afa8 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -6627,7 +6627,7 @@ def mode_edit_user(phase):
# Authentication
html.write("<tr><td class=legend>")
- html.write(_("Authentication<br><i>If you want to user to be able to login "
+ html.write(_("Authentication<br><i>If you want the user to be able to login "
"then specify a password here. Users without a login make sense "
"if they are monitoring contacts that are just used for "
"notifications. The repetition of the password is optional. "
@@ -7914,7 +7914,7 @@ def mode_rulesets(phase):
if phase == "title":
if only_host:
- return _("Rulesets for for hosts %s") % only_host
+ return _("Rulesets for hosts %s") % only_host
else:
return _("Rulesets for hosts and services")
diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py
index 02c40a9..8c1ff89 100644
--- a/web/plugins/wato/check_parameters.py
+++ b/web/plugins/wato/check_parameters.py
@@ -190,7 +190,7 @@ checkgroups.append((
("5", _("noSync") ),
("6", _("inSync") ),
("7", _("portFault") ),
- ("8", _("daigFault") ),
+ ("8", _("diagFault") ),
("9", _("lockRef") ),
]
),
diff --git a/web/plugins/wato/globals_notification.py b/web/plugins/wato/globals_notification.py
index 5479b20..ea47a21 100644
--- a/web/plugins/wato/globals_notification.py
+++ b/web/plugins/wato/globals_notification.py
@@ -95,7 +95,7 @@ register_configvar(group,
help = _ ("This template will be used as email body when sending notifications. "
"Appended to it will be a specific body for either host or service "
"notifications configured in two extra parameters. "
- "The following macros are available all templates:<br><br>"
+ "The following macros are available in all templates:<br><br>"
"<tt><b>$CONTACTNAME$</b></tt>: login name of the contact person, "
"<tt><b>$CONTACTEMAIL$</b></tt>: email address of the contact person, "
"<tt><b>$NOTIFICATIONTYPE$</b></tt>: one of PROBLEM, RECOVERY, ACKNOWLEDGEMENT, FLAPPINGSTART, FLAPPINGSTOP, FLAPPINGDISABLED, DOWNTIMESTART, DOWNTIMEEND, or DOWNTIMECANCELLED, "