Module: check_mk
Branch: master
Commit: 1f7caa2a992451bcb8bac146fcaa9ea55d5901ea
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1f7caa2a992451…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon May 2 15:20:11 2016 +0200
3455 FIX Fixed broken switch port filtering/sorting view
---
.werks/3455 | 10 ++++++++++
ChangeLog | 1 +
web/plugins/views/inventory.py | 6 ++----
3 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/.werks/3455 b/.werks/3455
new file mode 100644
index 0000000..7d74ce6
--- /dev/null
+++ b/.werks/3455
@@ -0,0 +1,10 @@
+Title: Fixed broken switch port filtering/sorting view
+Level: 1
+Component: inv
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.9i1
+Date: 1462195112
+
+
diff --git a/ChangeLog b/ChangeLog
index 7dee61b..b6e114b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -397,6 +397,7 @@
* 3340 FIX: Fixed exception when searching for software package sizes
* 3025 FIX: solaris_pkginfo: the last element of the reported software package list
was always missing
* 3526 FIX: Inventory scripts are no longer called when no data is available for
their section...
+ * 3455 FIX: Fixed broken switch port filtering/sorting view
1.2.8b1:
diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py
index 15905c2..c1cc7c4 100644
--- a/web/plugins/views/inventory.py
+++ b/web/plugins/views/inventory.py
@@ -781,10 +781,8 @@ def inv_multisite_table(infoname, invpath, columns, add_headers,
only_sites, lim
header = filt.filter(infoname)
if not header.startswith("Sites:"):
filter_code += header
- host_columns = list(set([ "host_name" ] + filter(lambda c:
c.startswith("host_"), columns)))
-
- sites.live().set_only_sites(only_sites)
- sites.live().set_prepend_site(True)
+ host_columns = [ "host_name" ] + list(set(filter(lambda c:
c.startswith("host_")
+ and c !=
"host_name", columns)))
query = "GET hosts\n"
query += "Columns: " + (" ".join(host_columns)) + "\n"