Module: check_mk
Branch: master
Commit: 75336537a3a119898aebc055347133e0ed2d27e4
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=75336537a3a119…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Nov 12 11:56:46 2014 +0100
#1498 FIX Fixed displaying of global settings titles / help texts
Some titles were not displayed correctly or the help texts were
missing. This is fixed now.
---
.werks/1498 | 11 +++++++++++
ChangeLog | 1 +
web/htdocs/wato.py | 2 +-
3 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/.werks/1498 b/.werks/1498
new file mode 100644
index 0000000..01cc8a9
--- /dev/null
+++ b/.werks/1498
@@ -0,0 +1,11 @@
+Title: Fixed displaying of global settings titles / help texts
+Level: 1
+Component: wato
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.5i7
+Date: 1415789769
+
+Some titles were not displayed correctly or the help texts were
+missing. This is fixed now.
diff --git a/ChangeLog b/ChangeLog
index 4e23505..d92276f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -50,6 +50,7 @@
* 1490 FIX: Timperiod excludes can now even be configured when creating a
timeperiod...
* 1491 FIX: Fixed bug in dynamic lists where removing an item was not always
possible...
* 1492 FIX: Fixed too long URL bug when deleting a timeperiod right after creating
one
+ * 1498 FIX: Fixed displaying of global settings titles / help texts...
Notifications:
* 1168 FIX: HTML mails can now be configured to display graphs among each other...
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index 3af6b8b..08fcac2 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -7396,7 +7396,7 @@ def render_global_configuration_variables(default_values,
current_settings, show
help_text = type(valuespec.help()) == unicode and
valuespec.help().encode("utf-8") or valuespec.help() or ''
title_text = type(valuespec.title()) == unicode and
valuespec.title().encode("utf-8") or valuespec.title()
title = '<a href="%s" class=%s
title="%s">%s</a>' % \
- (edit_url, varname in current_settings and "modified" or
"",
+ (edit_url, varname in current_settings and
'"modified"' or '""',
html.strip_tags(help_text), title_text)
if varname in current_settings: