Module: check_mk
Branch: master
Commit: 9e21643107e6503b1b1b6d5cbabdf4243f647b06
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9e21643107e650…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Tue Apr 17 17:08:01 2012 +0200
FIX: fix exception when disallowing changing display options
---
.bugs/707 | 7 +++++--
ChangeLog | 1 +
web/htdocs/views.py | 3 ++-
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/.bugs/707 b/.bugs/707
index eca28fe..09b672a 100644
--- a/.bugs/707
+++ b/.bugs/707
@@ -1,9 +1,9 @@
Title: WATO dashlets Service problems and Events of rec. 4 hours can die if view is
missing
Component: multisite
-State: open
+Class: nastiness
+State: done
Date: 2012-04-16 17:10:07
Targetversion: 1.2.0
-Class: nastiness
The dashlets will print the following error
Internal error:: 'aggr_onlyproblems'
@@ -24,3 +24,6 @@ Change column display options
Since this is user-modifyable we need to catch it and i.e. disable the dashlets.
+
+2012-04-17 17:07:35: changed state open -> done
+Fixed.
diff --git a/ChangeLog b/ChangeLog
index 96d897c..15326a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -48,6 +48,7 @@
* FIX: Fix problem where snapins where invisible
* FIX: Fixed multisite timeout errors when nagios not running
* Sidebar: some new layout improvements
+ * FIX: fix exception when disallowing changing display options
BI
* FIX: Fixed filtering of Single-Host Aggregations
diff --git a/web/htdocs/views.py b/web/htdocs/views.py
index 0eeeae8..c897f36 100644
--- a/web/htdocs/views.py
+++ b/web/htdocs/views.py
@@ -1561,7 +1561,8 @@ def view_options(viewname):
else:
for on, opt in multisite_painter_options.items():
- del v[on]
+ if on in v:
+ del v[on]
opt["value"] = None
if must_save: