20 Jun
2014
20 Jun
'14
3:14 a.m.
Module: check_mk
Branch: master
Commit: 1d5093f14038de1816a00698410157d9c8080827
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d5093f14038de…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Jun 20 09:21:20 2014 +0200
FIX Sorting columns in view dashlets is now working again
---
.bugs/2131 | 7 +++++--
.werks/822 | 8 ++++++++
ChangeLog | 1 +
doc/treasures/livedump/livedump-mail-fetch | 6 +++---
web/htdocs/dashboard.py | 2 +-
web/htdocs/views.py | 2 --
6 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/.bugs/2131 b/.bugs/2131
index c46c32b..a43267b 100644
--- a/.bugs/2131
+++ b/.bugs/2131
@@ -1,9 +1,12 @@
Title: Sorting views in dashlets, breaks layout
Component: multisite
-State: open
+Class: bug
+State: done
Date: 2014-06-16 15:40:12
Targetversion: 1.2.5i1
-Class: bug
When a view is sorted within a dashlet, the display_options seem to be mixed. Suddenly
the view header
is visible.
+
+2014-06-20 09:20:57: changed state open -> done
+Fixed.
diff --git a/.werks/822 b/.werks/822
new file mode 100644
index 0000000..0b9a8b4
--- /dev/null
+++ b/.werks/822
@@ -0,0 +1,8 @@
+Title: Sorting columns in view dashlets is now working again
+Level: 1
+Component: multisite
+Version: 1.2.5i4
+Date: 1403248860
+Class: fix
+
+
diff --git a/ChangeLog b/ChangeLog
index ed3a14c..c0fcce9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,7 @@
* 0820 FIX: Fixed wrong NagVis links in "custom links" snapin
* 0938 FIX: logwatch: fixed incorrect display of warning messages
* 0939 FIX: Fixed multisite exception caused by missing explanation text for a
AUTODELETE event action
+ * 0822 FIX: Sorting columns in view dashlets is now working again
WATO:
* 0987 New button for updating DNS cache...
diff --git a/doc/treasures/livedump/livedump-mail-fetch
b/doc/treasures/livedump/livedump-mail-fetch
index 7078161..af9a85b 100755
--- a/doc/treasures/livedump/livedump-mail-fetch
+++ b/doc/treasures/livedump/livedump-mail-fetch
@@ -21,9 +21,9 @@ import quopri
import tempfile
omd_root = os.environ.get('OMD_ROOT')
-pop_server = "pop.1und1.de"
-pop_user = "monitor(a)grillwerkstatt.at"
-pop_pass = "LTWmonitor2013"
+pop_server = "pop.yourmailserver.com"
+pop_user = "your-username(a)domain.com"
+pop_pass = "secretpassword"
M = poplib.POP3_SSL(pop_server)
M.user(pop_user)
diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py
index e58aed6..cf7a5fa 100644
--- a/web/htdocs/dashboard.py
+++ b/web/htdocs/dashboard.py
@@ -223,7 +223,7 @@ def render_dashlet(nr, dashlet, wato_folder):
# The method "view" is a shortcut for "iframe" with a certain
url
if "view" in dashlet:
- dashlet["iframe"] =
"view.py?view_name=%s&_display_options=HRSIXL&_body_class=dashlet" %
dashlet["view"]
+ dashlet["iframe"] =
"view.py?view_name=%s&display_options=HRSIXL&_display_options=HRSIXL&_body_class=dashlet"
% dashlet["view"]
if dashlet.get("reload_on_resize"):
dashlet["onload"] = "dashlet_add_dimensions('dashlet_%d',
this)" % nr
diff --git a/web/htdocs/views.py b/web/htdocs/views.py
index a7abb19..dd155df 100644
--- a/web/htdocs/views.py
+++ b/web/htdocs/views.py
@@ -1286,8 +1286,6 @@ def prepare_display_options():
display_options = html.var("_display_options", "")
display_options = apply_display_option_defaults(display_options)
html.display_options = display_options
- # Dont do this!! This garbles up the title links after a reload.
- #html.title_display_options = display_options
# But there is one special case: The sorter links! These links need to know
# about the provided display_option parameter. The links could use