[checkmk-commits] Check_MK Git: check_mk: FIX: User list shows names of contactgroups when no alias given

Module: check_mk Branch: master Commit: 796adbfabb9667777b12255356555606d77dfda6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=796adbfabb9667… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Thu Sep 6 17:18:21 2012 +0200 FIX: User list shows names of contactgroups when no alias given --- ChangeLog | 1 + web/htdocs/wato.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 913c60d..6e600e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -72,6 +72,7 @@ * User managament: Added fields for editing host/service notification commands * FIX: Removed double collect_hosts() call in activate changes hook * FIX: Fixed double hook execution when using localized multisite + * FIX: User list shows names of contactgroups when no alias given BI: * Great speed up of rule compilation in large environments diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index ff95d1d..e078419 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7517,7 +7517,8 @@ def mode_users(phase): cgs = user.get("contactgroups", []) if cgs: html.write(", ".join( - [ '<a href="%s">%s</a>' % (make_link([("mode", "edit_contact_group"), ("edit", c)]), contact_groups[c]) for c in cgs])) + [ '<a href="%s">%s</a>' % (make_link([("mode", "edit_contact_group"), ("edit", c)]), + contact_groups[c] and contact_groups[c] or c) for c in cgs])) else: html.write("<i>" + _("none") + "</i>") html.write("</td>")