[checkmk-commits] Check_MK Git: check_mk: #1268 The Snapins "Folders" and "Tree of Folders" can now be used by users without wato permission

Module: check_mk Branch: master Commit: 0f7ca13b681a9b0163923c1238a26c489fb669f4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0f7ca13b681a9b… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Jul 10 10:44:03 2015 +0200 #1268 The Snapins "Folders" and "Tree of Folders" can now be used by users without wato permission --- .werks/1268 | 9 +++++++++ ChangeLog | 1 + web/plugins/sidebar/wato.py | 4 ---- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.werks/1268 b/.werks/1268 new file mode 100644 index 0000000..5262dcc --- /dev/null +++ b/.werks/1268 @@ -0,0 +1,9 @@ +Title: The Snapins "Folders" and "Tree of Folders" can now be used by users without wato permission +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.7i3 +Date: 1436517779 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 1fafcba..eb38d43 100644 --- a/ChangeLog +++ b/ChangeLog @@ -49,6 +49,7 @@ * 2390 SEC: Fixed possible XSS issue on views... * 2391 SEC: Auth cookie is using "secure" flag when HTTPS request detected... * 2392 SEC: Auth cookie is always using "httponly" flag... + * 1268 The Snapins "Folders" and "Tree of Folders" can now be used by users without wato permission * 2314 FIX: Availability: fixed exception when grouping by host or service group * 2361 FIX: Fix exception for missing key 'title' in certain cases of older customized views * 2379 FIX: Plugin-Output: Fixed handling of URLs within output of check_http... diff --git a/web/plugins/sidebar/wato.py b/web/plugins/sidebar/wato.py index 0a50ffd..243a2b2 100644 --- a/web/plugins/sidebar/wato.py +++ b/web/plugins/sidebar/wato.py @@ -124,7 +124,6 @@ def compute_foldertree(): wato_folder = {} if wato.folder_config_exists(wato.root_dir + path): wato_folder = wato.load_folder(wato.root_dir + path, childs = False) - return { 'title': wato_folder.get('title', path.split('/')[-1]), '.path': path, @@ -217,9 +216,6 @@ def render_wato_foldertree(): if not config.wato_enabled: html.write(_("WATO is disabled.")) return False - elif not config.may("wato.use"): - html.write(_("You are not allowed to use Check_MK's web configuration GUI.")) - return False user_folders = compute_foldertree()