Module: check_mk
Branch: master
Commit: 58f83b9e0f1139a256635b72a116f54e84af4cb3
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=58f83b9e0f1139…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Fri Apr 8 10:34:22 2016 +0200
3240 FIX Fixed various quotation issues in GUI parts related to the EC
---
.werks/3240 | 10 ++++++++++
ChangeLog | 1 +
web/.f12 | 1 -
web/plugins/wato/mkeventd.py | 6 +++---
4 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/.werks/3240 b/.werks/3240
new file mode 100644
index 0000000..ec79c1a
--- /dev/null
+++ b/.werks/3240
@@ -0,0 +1,10 @@
+Title: Fixed various quotation issues in GUI parts related to the EC
+Level: 1
+Component: ec
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.9i1
+Date: 1460104355
+
+
diff --git a/ChangeLog b/ChangeLog
index 821623d..087fa9c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -273,6 +273,7 @@
* 3335 FIX: Improved error handling when requested rule pack does not exist
* 3348 FIX: Improved error handling when trying to edit not existing rules/rule
packs
* 3350 FIX: Merged source of Event Console with Check_MK...
+ * 3240 FIX: Fixed various quotation issues in GUI parts related to the EC
Livestatus:
* 3233 FIX: Fixed shutdown of Nagios core with Livestatus module...
diff --git a/web/.f12 b/web/.f12
index 0acbb42..00af3ce 100644
--- a/web/.f12
+++ b/web/.f12
@@ -3,7 +3,6 @@ SITE=${SITE:-$(cat ../.site 2>/dev/null || true)}
SITE=${SITE:-$(omd sites --bare | head -n 1)}
sudo rsync \
--exclude=defaults.py \
- --exclude "*mkevent*" \
--exclude "*cmc.py" \
--exclude "*omd_configuration.py" \
-varx htdocs plugins /omd/sites/$SITE/share/check_mk/web/
diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py
index 118dfbe..951b3c8 100644
--- a/web/plugins/wato/mkeventd.py
+++ b/web/plugins/wato/mkeventd.py
@@ -192,7 +192,7 @@ vs_mkeventd_actions = \
),
title_function = lambda value: not value["id"] and _("New
Action") or (value["id"] + " - " + value["title"]),
),
- title = _("Actions (Emails & Scripts)"),
+ title = _("Actions (Emails & Scripts)"),
help = _("Configure that possible actions that can be performed when a "
"rule triggers and also manually by a user."),
totext = _("%d actions"),
@@ -748,8 +748,8 @@ vs_mkeventd_rule = Dictionary(
( _("Rule Properties"), [ "id", "description",
"comment", "docu_url", "disabled" ] ),
( _("Matching Criteria"), [ "match", "match_host",
"match_ipaddress", "match_application", "match_priority",
"match_facility",
"match_sl", "match_ok",
"cancel_priority", "match_timeperiod", "invert_matching"
]),
- ( _("Outcome & Action"), [ "state", "sl",
"contact_groups", "actions", "cancel_actions",
"cancel_action_phases", "drop", "autodelete" ]),
- ( _("Counting & Timing"), [ "count",
"expect", "delay", "livetime", ]),
+ ( _("Outcome & Action"), [ "state", "sl",
"contact_groups", "actions", "cancel_actions",
"cancel_action_phases", "drop", "autodelete" ]),
+ ( _("Counting & Timing"), [ "count", "expect",
"delay", "livetime", ]),
( _("Rewriting"), [ "set_text", "set_host",
"set_application", "set_comment", "set_contact" ]),
],
render = "form",