Module: check_mk
Branch: master
Commit: dc59a69ece5034c67723f5921017050a80bc3de6
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc59a69ece5034…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Feb 6 16:10:55 2017 +0100
4323 FIX Fixed wrong %s in notification rule title deletion confirm dialog
Change-Id: I9a9ad6a2a801b40ccfc244a636eb191b09fcdd3e
---
.werks/4323 | 9 +++++++++
ChangeLog | 1 +
web/htdocs/wato.py | 2 +-
3 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/.werks/4323 b/.werks/4323
new file mode 100644
index 0000000..fe85099
--- /dev/null
+++ b/.werks/4323
@@ -0,0 +1,9 @@
+Title: Fixed wrong %s in notification rule title deletion confirm dialog
+Level: 1
+Component: wato
+Compatible: compat
+Version: 1.4.0i4
+Date: 1486393832
+Class: fix
+
+
diff --git a/ChangeLog b/ChangeLog
index 03fe1a9..a49746c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -133,6 +133,7 @@
* 4231 FIX: Fixed broken host renaming when files are in var/check_mk/web
* 4317 FIX: Rule list: Removed the row limit of the rule tables
* 4318 FIX: Rule editor: Fixed wrong default value for yes/no rulesets
+ * 4323 FIX: Fixed wrong %s in notification rule title deletion confirm dialog
Notifications:
* 4197 FIX: Fix sending notification to global fallback email address
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index 1726ff6..217cce7 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -7866,7 +7866,7 @@ def generic_rule_list_actions(rules, what, what_title, save_rules):
if html.has_var("_delete"):
nr = int(html.var("_delete"))
rule = rules[nr]
- c = wato_confirm(_("Confirm deletion of %s"),
+ c = wato_confirm(_("Confirm deletion of %s") % what_title,
_("Do you really want to delete the %s
<b>%d</b> <i>%s</i>?") %
(what_title, nr,
rule.get("description","")))
if c: