Module: check_mk
Branch: master
Commit: 638cc767e2a343b08c11d763e382872466b022ed
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=638cc767e2a343…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Tue Nov 10 12:17:43 2015 +0100
Revert "#2784 FIX Search function of tables: fixed exception when columns contain
utf-8 encoded umlauts"
An even better solution is coming soon.
This reverts commit a84dd1d14d629a773fa2f619419fc2e057c1bff7.
---
.werks/2784 | 10 ----------
ChangeLog | 1 -
web/htdocs/table.py | 3 ---
3 files changed, 14 deletions(-)
diff --git a/.werks/2784 b/.werks/2784
deleted file mode 100644
index e48bf00..0000000
--- a/.werks/2784
+++ /dev/null
@@ -1,10 +0,0 @@
-Title: Search function of tables: fixed exception when columns contain utf-8 encoded
umlauts
-Level: 1
-Component: multisite
-Class: fix
-Compatible: compat
-State: unknown
-Version: 1.2.7i4
-Date: 1447150471
-
-This exception did not happen on every umlaut, just on columns with the python datatype
<i>str</i>.
diff --git a/ChangeLog b/ChangeLog
index 34a69b8..863a120 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -82,7 +82,6 @@
* 2729 FIX: Hosts/Hostproblems snapin: Fixed wrong livestatus query when filtering
lists
* 2709 FIX: fixed exception when opening the action menu...
* 2447 FIX: Fixed sorting of performancedata values with units...
- * 2784 FIX: Search function of tables: fixed exception when columns contain utf-8
encoded umlauts...
WATO:
* 2442 WATO remove host: improved cleanup of obsolete host files...
diff --git a/web/htdocs/table.py b/web/htdocs/table.py
index 403ef92..b86bf30 100644
--- a/web/htdocs/table.py
+++ b/web/htdocs/table.py
@@ -194,9 +194,6 @@ def end():
if state == "header" or fixed:
continue # skip filtering of headers or fixed rows
for cell_content, css_classes, colspan in row:
- if type(cell_content) == str:
- cell_content = cell_content.decode("utf-8")
-
if fixed or search_term in cell_content.lower():
filtered_rows.append((row, css, state, fixed))
break # skip other cells when matched