[checkmk-commits] Various cleanups of configuration options and their defaults

Module: check_mk Branch: master Commit: 01dc8f107d9849ac7a36497837d90e558e9a5657 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=01dc8f107d9849… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Mon Apr 25 16:16:30 2016 +0200 Various cleanups of configuration options and their defaults --- web/htdocs/lib.py | 1 + web/htdocs/sidebar.py | 5 +---- web/plugins/config/builtin.py | 3 +++ web/plugins/sidebar/shipped.py | 6 +----- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index 8f4f09d..af50f06 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -797,6 +797,7 @@ try: import ast literal_eval = ast.literal_eval except ImportError: + # pylint: disable=no-member # Python <2.5 compatibility try: from compiler import parse diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index b5d8d35..d0c7c87 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -802,10 +802,7 @@ def search_url_tmpl(used_filters, matched_instances): def search_livestatus(used_filters): - try: - limit = config.quicksearch_dropdown_limit - except: - limit = 80 + limit = config.quicksearch_dropdown_limit # We need to know which plugin lead to finding a particular host, so it # is neccessary to make one query for each plugin - sorry. For example diff --git a/web/plugins/config/builtin.py b/web/plugins/config/builtin.py index c23c1d1..3f4a20a 100644 --- a/web/plugins/config/builtin.py +++ b/web/plugins/config/builtin.py @@ -72,6 +72,9 @@ sidebar_show_scrollbar = False # Enable regular checking for popup notifications sidebar_notify_interval = None +# Maximum number of results to show in quicksearch dropdown +quicksearch_dropdown_limit = 80 + # _ _ _ _ # | | (_)_ __ ___ (_) |_ ___ # | | | | '_ ` _ \| | __/ __| diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 9dbe220..c3f54f8 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -478,11 +478,7 @@ def render_sitestatus(): title = _("Site %s is switched off") % site["alias"] else: switch = "off" - try: - linkview = config.sitestatus_link_view - except: - linkview = "sitehosts" - text = link(site["alias"], "view.py?view_name=%s&site=%s" % (linkview, sitename)) + text = link(site["alias"], "view.py?view_name=sitehosts&site=%s" % sitename) ex = state.get("exception") shs = state.get("status_host_state")