[checkmk-commits] Check_MK Git: check_mk: FIX: Fixed exception when editing contactgroups without alias

Module: check_mk Branch: master Commit: 7aaf3425a23f7549e040a23b86dc981ed8333a77 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7aaf3425a23f75… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 1 10:18:22 2013 +0100 FIX: Fixed exception when editing contactgroups without alias --- ChangeLog | 1 + web/htdocs/wato.py | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8062d53..d7bca96 100644 --- a/ChangeLog +++ b/ChangeLog @@ -94,6 +94,7 @@ * FIX: flexible notification valuespec is now localizable * FIX: Alias values of host/service/contact groups need to be set and unique within the group + * FIX: Fixed exception when editing contactgroups without alias * Suggest use default value for filesystem levels that make sense * Valuespec: CascadingDropdown now able to process choice values from functions * Freshness checking for classical passive Nagios checks (custom_checks) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 27a3b7e..4e6c116 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5820,16 +5820,18 @@ def mode_edit_group(phase, what): html.text_input("name", clone_group or "") html.set_focus("name") else: + clone_group = None html.write(name) html.set_focus("alias") forms.section(_("Alias")) html.help(_("An Alias or description of this group.")) alias = groups.get(name, "") - if not alias and clone_group: - alias = groups.get(clone_group, "") if not alias: - alias = name + if clone_group: + alias = groups.get(clone_group, "") + else: + alias = name html.text_input("alias", alias) forms.end() html.button("save", _("Save"))