[checkmk-commits] #2973 FIX showing subfolder info in WATO if there are more than four groups

Module: check_mk Branch: master Commit: cb0dd6a06f0effd3aba0c65013067c1589debf4e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb0dd6a06f0eff… Author: Simon Betz &lt;si(a)mathias-kettner.de&gt; Date: Mon Jan 25 15:45:33 2016 +0100 #2973 FIX showing subfolder info in WATO if there are more than four groups --- .werks/2973 | 9 +++++++++ ChangeLog | 1 + web/htdocs/wato.py | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/2973 b/.werks/2973 new file mode 100644 index 0000000..a8ad5b7 --- /dev/null +++ b/.werks/2973 @@ -0,0 +1,9 @@ +Title: showing subfolder info in WATO if there are more than four groups +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.7i4 +Date: 1453732849 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 147db2d..7b49a8c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -288,6 +288,7 @@ * 2905 FIX: Check plugins: Non existant man pages now result in helpful error messages * 2943 FIX: Preventing issues with password completion of browsers on user and profile edit pages * 2831 FIX: Removing a previously set custom attribute for a contact did not work as intented... + * 2973 FIX: showing subfolder info in WATO if there are more than four groups Notifications: * 2811 Mail notifications: Now able to add Host/Service Notes Url... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 3f3d552..504aa60 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -604,8 +604,8 @@ def show_subfolder_infos(subfolder): cgalias = groups.get(pg, {'alias': pg})['alias'] html.icon(_("Contactgroups that have permission on this folder"), "contactgroups") html.write(' %s<br>' % cgalias) - if num > 1 and len(perm_groups) > 4: - html.write(_('<i>%d more contact groups</i><br>') % (len(perm_groups) - num - 1)) + if num > 1 and len(permitted_groups) > 4: + html.write(_('<i>%d more contact groups</i><br>') % (len(permitted_groups) - num - 1)) break num_hosts = subfolder.num_hosts_recursively()