Module: check_mk
Branch: master
Commit: 7e63d9c201af41ae6d1fccef4a0448e822648ff4
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e63d9c201af41…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Dec 1 10:32:14 2016 +0100
4080 FIX Fixed possible exception "unsupported operand type" in matrix views
---
.werks/4080 | 10 ++++++++++
ChangeLog | 1 +
web/htdocs/views.py | 4 ++++
3 files changed, 15 insertions(+)
diff --git a/.werks/4080 b/.werks/4080
new file mode 100644
index 0000000..1b328d8
--- /dev/null
+++ b/.werks/4080
@@ -0,0 +1,10 @@
+Title: Fixed possible exception "unsupported operand type" in matrix views
+Level: 1
+Component: multisite
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.4.0i3
+Date: 1480584652
+
+
diff --git a/ChangeLog b/ChangeLog
index dbed8c1..883888f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -53,6 +53,7 @@
* 3981 FIX: Views: Fixed context button displaying depending on usage
* 4071 FIX: Removed notes_url from "LOG *" logwatch services...
* 4072 FIX: Fixed multiple issues in BI availability when groups or names contain
umlauts
+ * 4080 FIX: Fixed possible exception "unsupported operand type" in matrix
views
WATO:
* 3984 Permissions can now be filtered by providing a search term on the "edit
role" page...
diff --git a/web/htdocs/views.py b/web/htdocs/views.py
index 138257e..1215a52 100644
--- a/web/htdocs/views.py
+++ b/web/htdocs/views.py
@@ -731,6 +731,10 @@ class Cell(object):
def render(self, row):
row = join_row(row, self)
tdclass, content = self.render_content(row)
+
+ if tdclass == None:
+ tdclass = ""
+
if tdclass == "" and content == "":
return "", ""