Module: check_mk
Branch: master
Commit: 8381f47fdef366deb95a840b6bc91b18a3466cd4
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8381f47fdef366…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Nov 14 11:42:02 2016 +0100
4067 FIX Fixed broken inventory history view in current master
An exception "TypeError: 'NoneType' object is not callable" could
happend while
rendering a inventory history page.
---
.werks/4067 | 10 ++++++++++
ChangeLog | 1 +
web/htdocs/htmllib.py | 2 +-
web/plugins/views/inventory.py | 4 ++--
4 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/.werks/4067 b/.werks/4067
new file mode 100644
index 0000000..962c601
--- /dev/null
+++ b/.werks/4067
@@ -0,0 +1,10 @@
+Title: Fixed broken inventory history view in current master
+Level: 1
+Component: inv
+Compatible: compat
+Version: 1.4.0i3
+Date: 1479120067
+Class: fix
+
+An exception "TypeError: 'NoneType' object is not callable" could
happend while
+rendering a inventory history page.
diff --git a/ChangeLog b/ChangeLog
index ed18094..9cad745 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -38,6 +38,7 @@
HW/SW-Inventory:
* 4066 FIX: Fixed broken titles of nodes in inventory views
+ * 4067 FIX: Fixed broken inventory history view in current master...
1.4.0i2:
diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py
index 758df70..63acf26 100644
--- a/web/htdocs/htmllib.py
+++ b/web/htdocs/htmllib.py
@@ -367,7 +367,7 @@ class HTMLGenerator(OutputFunnel):
# these tags can be called by open_name(), close_name() and render_name(), e.g.
'self.open_html()'
_tag_names = set(['html', 'head', 'body', 'header',
'footer', 'a', 'b',\
'script', 'form', 'button',
'p', 'select',\
- 'table', 'tbody', 'row',
'ul', 'li', 'br', 'nobr', 'input'])
+ 'table', 'tbody', 'row',
'ul', 'li', 'br', 'nobr', 'input',
'span'])
# Of course all shortcut tags can be used as well.
_tag_names.update(_shortcut_tags)
diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py
index 38e4de9..53da4bd 100644
--- a/web/plugins/views/inventory.py
+++ b/web/plugins/views/inventory.py
@@ -262,12 +262,12 @@ def render_inv_dicttable(hostname, tree_id, invpath, node):
# In delta mode node is a pair of (old_items, new_items)
if type(node) == tuple:
html.write_text(_("Removed entries") + ":")
- html.write_span(class_="invold")
+ html.open_span(class_="invold")
render_inv_dicttable(hostname, tree_id, invpath, node[0])
html.close_span()
html.write(_("New entries") + ":")
- html.write_span(class_="invnew")
+ html.open_span(class_="invnew")
render_inv_dicttable(hostname, tree_id, invpath, node[1])
html.close_span()
return