[checkmk-commits] Check_MK Git: check_mk: FIX CSV export of event console was broken

Module: check_mk Branch: master Commit: 44dc80c6a114a2a93ee0879a584c9ed0c450331f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44dc80c6a114a2… Author: Bernd Stroessenreuther &lt;bs(a)mathias-kettner.de&gt; Date: Thu Dec 12 15:09:46 2013 +0100 FIX CSV export of event console was broken For views of event console the CSV export did produce a file containing only an error message. This is fixed now. --- .werks/89 | 9 +++++++++ ChangeLog | 1 + web/htdocs/htmllib.py | 2 ++ 3 files changed, 12 insertions(+) diff --git a/.werks/89 b/.werks/89 new file mode 100644 index 0000000..e7ea43e --- /dev/null +++ b/.werks/89 @@ -0,0 +1,9 @@ +Title: CSV export of event console was broken +Level: 2 +Component: ec +Version: 1.2.3i8 +Date: 1386857228 +Class: fix + +For views of event console the CSV export did produce a file containing only +an error message. This is fixed now. diff --git a/ChangeLog b/ChangeLog index 665aad2..6f2b8eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -41,6 +41,7 @@ * 0301 Handling messages of special syslog format correctly... * 0303 FIX: Old log entries were shown in event history first... * 0304 FIX: Escaping several unwanted chars from incoming log messages... + * 0089 FIX: CSV export of event console was broken... 1.2.3i7: diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index c628238..b9374a7 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1167,6 +1167,8 @@ class html: # remove all HTML-tags def strip_tags(self, ht): + if type(ht) not in [str, unicode]: + return ht while True: x = ht.find('<') if x == -1: