Module: check_mk
Branch: master
Commit: b54e97424959515d476a3a0a2ebd7524d05f32ba
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b54e9742495951…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Tue Oct 4 11:20:02 2011 +0200
FIX: fix permission computation
---
ChangeLog | 2 +-
web/htdocs/config.py | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a98ade4..c3faacd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,11 +10,11 @@
* cups_queues: Run agent part only on directly on CUPS servers,
not on clients
-
Multisite:
* FIX: fix rescheduling of host check
* FIX: fix exception when using status_host while local site is offline
* FIX: fix URL-too-long in permissions page
+ * FIX: fix permission computation
* Cleanup permissions page optically, add comments for views and snapins
* Added some missing i18n strings in general HTML functions
* Added display_option "w" to disable limit messages and livestatus errors
in views
diff --git a/web/htdocs/config.py b/web/htdocs/config.py
index 0994832..3ba6f2c 100644
--- a/web/htdocs/config.py
+++ b/web/htdocs/config.py
@@ -224,9 +224,9 @@ def login(u):
if users != None:
all += users
if all.count(user) > 1:
- raise MKConfigError("Your username (<b>%s</b>) is listed more
than once "
+ raise MKConfigError(_("Your username (<b>%s</b>) is listed more
than once "
"in multisite.mk. This is not allowed. "
- "Please check your config." % user)
+ "Please check your config.") % user)
role = role_of_user(user)
@@ -262,7 +262,7 @@ def role_of_user(u):
def may(permname):
# handle case where declare_permission is done after login
# and permname also not contained in save configuration
- if permname not in user_permissions:
+ if permname not in permissions:
perm = permissions_by_name.get(permname)
if not perm: # Object does not exists, e.g. sidesnap.multisite if not
is_multisite()
return False