Module: check_mk Branch: master Commit: 666da84c8a7e71f230f922086125d4c0b81e520a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=666da84c8a7e71… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Aug 25 10:06:18 2011 +0200 Multisite: avoid if/then construct that is not working on RedHat 5.6 --- ChangeLog | 4 ++++ web/htdocs/views.py | 6 +++++- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index eed23c3..4390f0d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +1.1.11i4: + Multisite: + * FIX: avoid if/then construct that is not working on RedHat 5.6 + 1.1.11i3: Core, Setup, etc.: * FIX: allow host names to have spaces diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 3bf420a..f46dacd 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1143,7 +1143,11 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru query = filterheaders + view.get("add_headers", "") # [4] Sorting - use view sorters or url supplied sorters - sorter_list = parse_url_sorters(html.var('sort')) if html.has_var('sort') else view["sorters"] + if html.has_var('sort'): + sorter_list = parse_url_sorters(html.var('sort')) + else: + sorter_list = view["sorters"] + sorters = [ (multisite_sorters[sn], reverse) for sn, reverse in sorter_list ] # [5] Grouping