Module: check_mk
Branch: master
Commit: ba03b00a0da23595f6483a74a63828600a08283c
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba03b00a0da235…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Oct 22 10:56:36 2015 +0200
#2687 FIX Quicksearch: Improved error handling
---
.werks/2687 | 10 ++++++++++
ChangeLog | 1 +
web/htdocs/sidebar.py | 18 ++++++++++--------
web/plugins/sidebar/search.py | 4 ++++
4 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/.werks/2687 b/.werks/2687
new file mode 100644
index 0000000..0a7768d
--- /dev/null
+++ b/.werks/2687
@@ -0,0 +1,10 @@
+Title: Quicksearch: Improved error handling
+Level: 1
+Component: multisite
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.7i4
+Date: 1445504158
+
+
diff --git a/ChangeLog b/ChangeLog
index ed339b9..d0fab2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,7 @@
* 2696 FIX: Fixed broken perfometer for update checks
* 2685 FIX: LDAP: Fixed failing synchronization when migrating some old configs...
* 2686 FIX: Fixed showing graphs for cluster ping services
+ * 2687 FIX: Quicksearch: Improved error handling
HW/SW-Inventory:
* 2436 NetApp monitoring: Now able to gather data for inventory...
diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py
index ba03c8d..edc1bdf 100644
--- a/web/htdocs/sidebar.py
+++ b/web/htdocs/sidebar.py
@@ -717,7 +717,7 @@ def to_regex(s):
re.compile(s)
except re.error:
raise MKGeneralException(_('You search statement is not valid. You need to
provide a regular '
- 'expression (regex). For example you need to e use
<tt>\\\\</tt> instead of <tt>\\</tt> '
+ 'expression (regex). For example you need to use
<tt>\\\\</tt> instead of <tt>\\</tt> '
'if you like to search for a single backslash.'))
return s
@@ -996,17 +996,19 @@ def ajax_search():
if not q:
return
- data, used_filters = process_search(q)
- if not data:
- return
-
try:
+ data, used_filters = process_search(q)
+ if not data:
+ return
+
render_search_results(used_filters, data)
+ except MKException, e:
+ html.show_error(e)
except Exception, e:
- html.write("error")
+ if config.debug:
+ raise
import traceback
- html.write(traceback.format_exc())
- html.write(repr(e))
+ html.show_error(traceback.format_exc())
def search_open():
diff --git a/web/plugins/sidebar/search.py b/web/plugins/sidebar/search.py
index 6e60dab..a1475e1 100644
--- a/web/plugins/sidebar/search.py
+++ b/web/plugins/sidebar/search.py
@@ -94,6 +94,10 @@ sidebar_snapins["search"] = {
background-color: #BFBFBF;
}
+#mk_search_results div.error {
+ padding: 2px;
+}
+
"""
}