Module: check_mk
Branch: master
Commit: e8e84ec3be63b81b06fe6559b3cae396fc24b61a
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e8e84ec3be63b8…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri May 2 10:05:09 2014 +0200
FIX Fix CSV-Export in availability table
---
.werks/962 | 8 ++++++++
ChangeLog | 1 +
web/htdocs/table.py | 4 ++--
3 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/.werks/962 b/.werks/962
new file mode 100644
index 0000000..1650e9c
--- /dev/null
+++ b/.werks/962
@@ -0,0 +1,8 @@
+Title: Fix CSV-Export in availability table
+Level: 1
+Component: reporting
+Version: 1.2.5i3
+Date: 1399017888
+Class: fix
+
+
diff --git a/ChangeLog b/ChangeLog
index f9761dc..68b5c7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -93,6 +93,7 @@
Reporting & Availability:
* 0756 Allow availability of multisite BI aggregates at once...
+ * 0962 FIX: Fix CSV-Export in availability table
Event Console:
* 0885 New option for writing all messages into a syslog-like logfile...
diff --git a/web/htdocs/table.py b/web/htdocs/table.py
index 7a4cef0..482a42d 100644
--- a/web/htdocs/table.py
+++ b/web/htdocs/table.py
@@ -177,7 +177,7 @@ def end():
for row, css, state in rows:
if state == "header":
continue
- for cell_content, css_classes, colspan in row:
+ for cell_content, css_classes in row:
if search_term in cell_content.lower():
filtered_rows.append((row, css, state))
break # skip other cells when matched
@@ -254,7 +254,7 @@ def end():
for nr, (row, css, state) in enumerate(rows):
if do_csv:
- html.write(csv_separator.join([ html.strip_tags(cell_content) for
cell_content, css_classes in row ]))
+ html.write(csv_separator.join([ html.strip_tags(cell_content) for
cell_content, css_classes, colspan in row ]))
html.write("\n")
else: # HTML output