Module: check_mk
Branch: master
Commit: 0a21ef228fb05a67a90c00e98b2350245ef47b08
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0a21ef228fb05a…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Thu Nov 13 12:32:10 2014 +0100
#1436 FIX quicksearch: search with multiple patterns (h: / s:) no longer discards the host
pattern
The host filter name of the target page was renamed from <tt>host</tt> to
<tt>host_regex</tt>.
The quicksearch still used the old filter name to insert this data. Therefore the host
pattern
data got discarded.
---
.werks/1436 | 13 +++++++++++++
ChangeLog | 1 +
web/plugins/sidebar/search.py | 2 +-
3 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/.werks/1436 b/.werks/1436
new file mode 100644
index 0000000..d6a8e75
--- /dev/null
+++ b/.werks/1436
@@ -0,0 +1,13 @@
+Title: quicksearch: search with multiple patterns (h: / s:) no longer discards the host
pattern
+Level: 1
+Component: multisite
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.5i7
+Date: 1415878184
+
+The host filter name of the target page was renamed from <tt>host</tt> to
<tt>host_regex</tt>.
+The quicksearch still used the old filter name to insert this data. Therefore the host
pattern
+data got discarded.
+
diff --git a/ChangeLog b/ChangeLog
index 9b0cd18..9e22544 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -47,6 +47,7 @@
* 1433 FIX: Quicksearch: no longer shows an invalid search result when looking for
multiple hosts...
* 1494 FIX: Fixed error in NagVis Maps snapin when some users had no contact groups
assigned
* 1496 FIX: Fixed exception after editing a dashboard as user without permission to
publish dashboards...
+ * 1436 FIX: quicksearch: search with multiple patterns (h: / s:) no longer discards
the host pattern...
WATO:
* 1170 Added buttons to move rules to top/bottom of the list to ruleset edit dialog
diff --git a/web/plugins/sidebar/search.py b/web/plugins/sidebar/search.py
index 2f03873..9b7aae8 100644
--- a/web/plugins/sidebar/search.py
+++ b/web/plugins/sidebar/search.py
@@ -244,7 +244,7 @@ def search_host_service_url_tmpl(used_filters, data, host_is_ip =
False):
tmpl = 'view.py?view_name=searchsvc&filled_in=filter'
for url_param, qs_name in [ ("service_regex", "services"
),
host_is_ip and ("host_address", "host"
)\
- or ("host", "hosts"
),
+ or ("host_regex", "hosts"
),
("opthostgroup",
"hostgroups" ),
("optservicegroup",
"servicegroups")]:
if filters_combined.get(qs_name):