Module: check_mk
Branch: master
Commit: 310f037014371adb0c5fcc06348a4b9f8572051d
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=310f037014371a…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Aug 25 13:10:35 2011 +0200
Fixed another merge problem; Reapplied fix
---
web/htdocs/views.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/web/htdocs/views.py b/web/htdocs/views.py
index 79d4049..b47808b 100644
--- a/web/htdocs/views.py
+++ b/web/htdocs/views.py
@@ -1162,7 +1162,7 @@ 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"]
+ sorter_list = html.has_var('sort') and
parse_url_sorters(html.var('sort')) or view["sorters"]
sorters = [ (multisite_sorters[sn], reverse) for sn, reverse in sorter_list ]
# [5] Grouping