[checkmk-commits] Check_MK Git: check_mk: Default downtime: removed way too fancy commenting feature

Module: check_mk Branch: master Commit: faf0158aba65b57d1721a44851b313954fcee22d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=faf0158aba65b5… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jun 27 14:55:24 2013 +0200 Default downtime: removed way too fancy commenting feature --- web/plugins/views/commands.py | 4 ---- web/plugins/wato/check_mk_configuration.py | 6 ++---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/web/plugins/views/commands.py b/web/plugins/views/commands.py index 23e9393..e8ae959 100644 --- a/web/plugins/views/commands.py +++ b/web/plugins/views/commands.py @@ -377,10 +377,6 @@ def command_downtime(cmdtag, spec, row): if down_to: comment = html.var_utf8("_down_comment") - try: # Catch formatting errors - comment = comment % { "user": config.user_id, "duration": int(down_to - down_from) } - except: - pass if not comment: raise MKUserError("_down_comment", _("You need to supply a comment for your downtime.")) if html.var("_down_flexible"): diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 8623261..01adfc2 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -289,16 +289,14 @@ register_configvar(group, elements = [ ("duration", Integer( title = _("Duration"), - help = _("The duration in minutes of the default downtime"), + help = _("The duration in minutes of the default downtime."), minvalue = 1, unit = _("minutes"), default_value = 60, )), ("comment", TextUnicode( title = _("Downtime comment"), - help = _("The default comment for a downtime. "\ - "You can use the placeholders %(user)s and %(duration)s "\ - "which will replaced when the downtime command is sent"), + help = _("The default comment for a downtime."), size = 80 )), ],