[checkmk-commits] 3583 FIX Fixed loosing some services after saving services in WATO

Module: check_mk Branch: master Commit: a6c0859e9654cdd495923fb853380a7d9207b342 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a6c0859e9654cd… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Tue May 31 10:59:06 2016 +0200 3583 FIX Fixed loosing some services after saving services in WATO Checks which were creating services with empty strings as check items, where dropped while saving the service configuration via "save manual check configuration". --- .werks/3583 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 3 +-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/3583 b/.werks/3583 new file mode 100644 index 0000000..5667ada --- /dev/null +++ b/.werks/3583 @@ -0,0 +1,11 @@ +Title: Fixed loosing some services after saving services in WATO +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1464684618 + +Checks which were creating services with empty strings as check items, +where dropped while saving the service configuration via "save manual check configuration". diff --git a/ChangeLog b/ChangeLog index a6d8f53..ca62d54 100644 --- a/ChangeLog +++ b/ChangeLog @@ -404,6 +404,7 @@ * 3534 FIX: Fixed exception with upload of interlaced PNG files... * 3242 FIX: Fixed hostname translation for empty optional groups * 3579 FIX: Fixed visibility of SNMP community attribute when SNMP tag is inherited + * 3583 FIX: Fixed loosing some services after saving services in WATO... Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d28a4b6..2fadb23 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2784,7 +2784,6 @@ def show_service_table(host, firsttime): ]: first = True for st, ct, checkgroup, item, paramstring, params, descr, state, output, perfdata in checktable: - item = html.attrencode(item or 'None') if check_source != st: continue if first: @@ -2808,7 +2807,7 @@ def show_service_table(host, firsttime): manpage_url = folder_preserving_link([("mode", "check_manpage"), ("check_type", ctype)]) table.cell(_("Status"), statename, css=stateclass) table.cell(_("Checkplugin"), '<a href="%s">%s</a>' % (manpage_url, ctype)) - table.cell(_("Item"), item) + table.cell(_("Item"), html.attrencode(item)) table.cell(_("Service Description"), html.attrencode(descr)) table.cell(_("Plugin output"))