Module: check_mk
Branch: master
Commit: f6c3fb8ab894fa1963c9383e42bd78eab847f022
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f6c3fb8ab894fa…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Thu Jan 26 10:04:22 2017 +0100
4015 FIX Multisite events page: Fixed slow page generation caused by the event delete
icon
The render function for the event delete icon has been improved.
It now uses cache data.
Change-Id: I2bddfe7554f77724ed5dc255a426ef493dfb7452
---
.werks/4015 | 11 +++++++++++
ChangeLog | 1 +
web/plugins/views/mkeventd.py | 2 +-
3 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/.werks/4015 b/.werks/4015
new file mode 100644
index 0000000..5c66646
--- /dev/null
+++ b/.werks/4015
@@ -0,0 +1,11 @@
+Title: Multisite events page: Fixed slow page generation caused by the event delete icon
+Level: 1
+Component: multisite
+Compatible: compat
+Version: 1.4.0i4
+Date: 1485421223
+Class: fix
+
+The render function for the event delete icon has been improved.
+It now uses cache data.
+
diff --git a/ChangeLog b/ChangeLog
index ec16e63..b5bffcb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -89,6 +89,7 @@
* 4307 FIX: Fixed wrong filters in Eventviews linked by Tactical Overview
* 4282 FIX: Fixed rendering of perfometers when no RRDs exist yet
* 4285 FIX: Availability: Timeline tables can now not be sorted and searched anymore
+ * 4015 FIX: Multisite events page: Fixed slow page generation caused by the event
delete icon...
WATO:
* 4142 New extended search dialog for rulesets and rules...
diff --git a/web/plugins/views/mkeventd.py b/web/plugins/views/mkeventd.py
index 3a03926..4a0b9d8 100644
--- a/web/plugins/views/mkeventd.py
+++ b/web/plugins/views/mkeventd.py
@@ -312,7 +312,7 @@ if mkeventd_enabled:
urlvars += parse_qsl(url.query)
else:
# Regular view
- view = get_view_by_name(html.var("view_name"))
+ view = permitted_views()[(html.var("view_name"))]
target = None
filename = None