[checkmk-commits] Refactored expire valuespec definition

Module: check_mk Branch: master Commit: 48e7a1f46ee84b55524f7fd6968ad3665a65b77f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=48e7a1f46ee84b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 10 17:45:24 2018 +0200 Refactored expire valuespec definition Change-Id: If1a10e34a1354488d47794523e0f880c3f4761e1 --- cmk/gui/plugins/views/commands.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/cmk/gui/plugins/views/commands.py b/cmk/gui/plugins/views/commands.py index 73fc782..0cfbc16 100644 --- a/cmk/gui/plugins/views/commands.py +++ b/cmk/gui/plugins/views/commands.py @@ -440,7 +440,7 @@ def command_acknowledgement(cmdtag, spec, row): sendnot = 1 if html.var("_ack_notify") else 0 perscomm = 1 if html.var("_ack_persistent") else 0 - expire_secs = Age().from_html_vars("_ack_expire") + expire_secs = _vs_expire().from_html_vars("_ack_expire") if expire_secs: expire = int(time.time()) + expire_secs expire_text = ";%d" % expire @@ -484,13 +484,21 @@ def render_acknowledgement(): html.checkbox("_ack_persistent", config.view_action_defaults["ack_persistent"], label=_('persistent comment')) html.hr() - Age(display=["days", "hours", "minutes"], label=_("Expire acknowledgement after")).render_input("_ack_expire", 0) + + _vs_expire().render_input("_ack_expire", 0) html.help(_("Note: Expiration of acknowledgements only works when using the Check_MK Micro Core.")) html.hr() html.write_text(_("Comment") + ": ") html.text_input("_ack_comment", size=48, submit="_acknowledge") +def _vs_expire(): + return Age( + display=["days", "hours", "minutes"], + label=_("Expire acknowledgement after") + ) + + register_command_group( ident = "acknowledge", title = _("Acknowledge"),