[checkmk-commits] 4033 Quicksearch: Now cycles through the filters h:/ad:/al:/s:

when no specific filters are set Message-ID: <58aea700.zZJV4RVytjzezJGr%ab(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 9aa43e747bfbca92c74ccec4cadc1590e5cfd9a6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9aa43e747bfbca… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Feb 23 10:02:53 2017 +0100 4033 Quicksearch: Now cycles through the filters h:/ad:/al:/s: when no specific filters are set Once a match is found the data is shown. So if the address matches, the query won't issue an al: or s: query. Change-Id: Ib2205aa84a2ccba9579f0e859b4f6573ff379aea --- .werks/4033 | 13 +++++++++++++ web/htdocs/sidebar.py | 10 +++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/.werks/4033 b/.werks/4033 new file mode 100644 index 0000000..d9019d2 --- /dev/null +++ b/.werks/4033 @@ -0,0 +1,13 @@ +Title: Quicksearch: Now cycles through the filters h:/ad:/al:/s: when no specific filters are set +Level: 1 +Component: multisite +Class: feature +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1487840420 + +Once a match is found the data is shown. So if the address matches, +the query won't issue an al: or s: query. + diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index b420974..383d371 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -807,10 +807,14 @@ class LivestatusQuicksearch(object): self._determine_used_filters() self._execute_livestatus_command() - # If no rows were found with the given (filterless) query, issue a service query + # If no rows were found with the given (filterless) query, issue + # -> Hostaddress -> Hostalias -> Service description if not self._rows and self._no_filters_set: - self._used_filters = {"s": [self._query]} - self._execute_livestatus_command() + for try_filter in ["ad", "al", "s"]: + self._used_filters = {try_filter: [self._query]} + self._execute_livestatus_command() + if self._rows: + break def _determine_used_filters(self):