Checkmk git commits July 2012

checkmk-commits@lists.checkmk.com

1 participants
183 discussions

Check_MK Git: check_mk: FIX: massive speedup when changing roles/ users and activing changes

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c987a1cc926c4076cfb176ae84af0a26734107bf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c987a1cc926c40… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jul 2 14:40:09 2012 +0200 FIX: massive speedup when changing roles/users and activing changes --- ChangeLog | 2 ++ web/htdocs/wato.py | 9 +++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index dac646e..d58677d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -44,6 +44,8 @@ * FIX: fix exception on unknown value in DropdownChoice * FIX: add service specification to ruleset Delay service notifications * FIX: fixed problem with disabled sites in WATO + * FIX: massive speedup when changing roles/users and activing changes + (especially when you have a larger number of users and folders) BI: * New iterators FOREACH_CHILD and FOREACH_PARENT diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 4c84465..8cd617d 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -992,12 +992,12 @@ def get_folder_permissions_of_users(users): permissions[username] = {} for folder_path, folder in folders.iteritems(): permissions[username][folder_path] = { - 'read': check_folder_permissions(folder, 'read', False, username) == True, - 'write': check_folder_permissions(folder, 'write', False, username) == True, + 'read': check_folder_permissions(folder, 'read', False, username, users) == True, + 'write': check_folder_permissions(folder, 'write', False, username, users) == True, } return permissions -def check_folder_permissions(folder, how, exception=True, user = None): +def check_folder_permissions(folder, how, exception=True, user = None, users = None): if not user: if config.may("wato.all_folders"): return True @@ -1017,7 +1017,8 @@ def check_folder_permissions(folder, how, exception=True, user = None): user = config.user_id # Get contact groups of user - users = load_users() + if users == None: + users = load_users() if user not in users: user_cgs = [] else:

12 years, 5 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: af085fb3c30c35e598a932e73b6a35b0a2e05cc0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=af085fb3c30c35… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jul 2 13:56:08 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 5 months

Check_MK Git: check_mk: Updated bug entries #0781

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 45a9614cfaee3e89d8b93f750ac8f143cbcf2469 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=45a9614cfaee3e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jul 2 13:56:06 2012 +0200 Updated bug entries #0781 --- .bugs/781 | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/.bugs/781 b/.bugs/781 new file mode 100644 index 0000000..efd7c29 --- /dev/null +++ b/.bugs/781 @@ -0,0 +1,22 @@ +Title: Setting default_language = "de" in multisite.mk breaks all +Component: multisite +State: open +Date: 2012-07-02 13:55:03 +Targetversion: 1.2.0 +Class: bug + +Try: set default_language = "de" in multisite.mk. But do not +provide a language file. The result is an exception: + +Internal error None (/de) 13:54 +index.py?debug=1 +Internal error:: global name 'config' is not defined + +Traceback (most recent call last): + File "/omd/sites/opf/share/check_mk/web/htdocs/index.py", line 272, in handler + load_language(html.var("lang", config.get_language())) + File "/omd/sites/opf/share/check_mk/web/htdocs/lib.py", line 197, in load_language + __builtin__.current_language = config.default_language +NameError: global name 'config' is not defined + +[URL to this frame] [URL to this page including sidebar]

12 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2012