[checkmk-commits] Check_MK Git: check_mk: #1876 FIX User sorting of views can now be disabled again

Module: check_mk Branch: master Commit: 5350718b04182a3ceee6f351e8733345404d954e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5350718b04182a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 22 12:16:27 2015 +0100 #1876 FIX User sorting of views can now be disabled again --- .werks/1876 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/views.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/1876 b/.werks/1876 new file mode 100644 index 0000000..80f09c3 --- /dev/null +++ b/.werks/1876 @@ -0,0 +1,10 @@ +Title: User sorting of views can now be disabled again +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1421925361 + + diff --git a/ChangeLog b/ChangeLog index 137e94a..a94d7cb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -128,6 +128,7 @@ * 1870 FIX: Joined columns were empty in CSV, JSON or PYTHON exports of view... * 1871 FIX: Site filter is only shown as host related filter now... * 1872 FIX: View editor hides filter selection for object types which have no filter to choose... + * 1876 FIX: User sorting of views can now be disabled again WATO: * 1760 Added search form to manual checks page diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 321f65e..0d0d2bc 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2237,7 +2237,7 @@ def paint_header(view, p): onclick = '' title = '' if 'L' in html.display_options \ - and view.get('user_sortable', True) \ + and view.get('user_sortable', False) \ and get_sorter_name_of_painter(painter) is not None: params = [ ('sort', sort_url(view, painter, join_index)),