Module: check_mk
Branch: master
Commit: e744bba208591b1dc95e3a5bc0e38a03df78a53c
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e744bba208591b…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Mar 26 15:22:21 2012 +0200
Added config option default_ts_format to configure default timestamp
output format in multisite
---
ChangeLog | 2 ++
web/htdocs/config.py | 3 +++
web/plugins/views/painters.py | 2 +-
3 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index af05e44..38b79f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
* FIX: deletion of automation accounts now works
Multisite
+ * Added config option default_ts_format to configure default timestamp
+ output format in multisite
* FIX: Fixed encoding problem in "custom notification" message
Checks & Agents:
diff --git a/web/htdocs/config.py b/web/htdocs/config.py
index 9e88fdf..1bd5335 100644
--- a/web/htdocs/config.py
+++ b/web/htdocs/config.py
@@ -586,6 +586,9 @@ filter_columns = 2
# Default language for l10n
default_language = None
+# Default timestamp format to be used in multisite
+default_ts_format = 'mixed'
+
# Default authentication type. Can be changed to e.g. "cookie" for
# using the cookie auth
auth_type = 'basic'
diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py
index acdfa9d..eb961b2 100644
--- a/web/plugins/views/painters.py
+++ b/web/plugins/views/painters.py
@@ -84,7 +84,7 @@ multisite_painter_options["pnpview"] = {
multisite_painter_options["ts_format"] = {
"title" : _("Time stamp format"),
- "default" : "mixed",
+ "default" : config.default_ts_format,
"values" : [
("mixed", _("Mixed")),
("abs", _("Absolute")),