[checkmk-commits] Check_MK Git: check_mk: RBN: add optional comment field

Module: check_mk Branch: master Commit: e34daaa6205e376e8dda956358a8e081d6360b54 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e34daaa6205e37… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Tue Mar 18 10:05:38 2014 +0100 RBN: add optional comment field --- web/htdocs/wato.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 71e246b..f4784eb 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7472,6 +7472,13 @@ def vs_notification_rule(userid = None): attrencode = True, allow_empty = False, )), + ( "comment", + TextAreaUnicode( + title = _("Comment"), + help = _("An optional comment that explains the purpose of this rule."), + rows = 5, + ) + ), ( "disabled", Checkbox( title = _("Rule activation"), @@ -7730,7 +7737,7 @@ def vs_notification_rule(userid = None): "match_sl", "match_host_event", "match_service_event", "match_checktype", "bulk", "contact_users", "contact_groups", "contact_emails" ], headers = [ - ( _("General Properties"), [ "description", "disabled", "allow_disable" ] ), + ( _("General Properties"), [ "description", "comment", "disabled", "allow_disable" ] ), ( _("Notification Method"), [ "notify_plugin", "notify_method", "bulk" ] ),] + contact_headers + [ @@ -7988,7 +7995,8 @@ def mode_notifications(phase): "one <a href=\"%s\">here</a>.") % url) if show_bulks: - render_bulks(only_ripe = False) # Warn if there are unsent bulk notificatios + if not render_bulks(only_ripe = False): # Warn if there are unsent bulk notificatios + html.message(_("Currently there are no unsent notification bulks pending.")) else: render_bulks(only_ripe = True) # Warn if there are unsent bulk notificatios @@ -8118,6 +8126,9 @@ def render_bulks(only_ripe): if len(uuids) >= maxcount: html.icon(_("Number of notifications exceeds maximum allowed number"), "warning") table.end() + return True + else: + return False