[checkmk-commits] Move show_view() specific only_count handling out of get_sorters()

Module: check_mk Branch: master Commit: 1f3d316256f01d1105ec1fa2a524ed5360c29da2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1f3d316256f01d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 4 14:27:08 2019 +0100 Move show_view() specific only_count handling out of get_sorters() Change-Id: Ia3d49312a7875052983132da1be9ef455d6ec40c --- cmk/gui/views.py | 10 +++++----- tests/unit/cmk/gui/test_views.py | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmk/gui/views.py b/cmk/gui/views.py index dc8158a..d1f0087 100644 --- a/cmk/gui/views.py +++ b/cmk/gui/views.py @@ -1246,7 +1246,10 @@ def show_view(view, view_renderer, only_count=False): query = filterheaders + view.spec.get("add_headers", "") # Sorting - use view sorters and URL supplied sorters - sorters = get_sorters(view.spec, only_count, html.request.var("sort")) + if only_count: + sorters = [] + else: + sorters = _get_sorters(view.spec, html.request.var("sort")) # Prepare cells of the view # Group cells: Are displayed as titles of grouped rows @@ -1354,10 +1357,7 @@ def show_view(view, view_renderer, only_count=False): SorterEntry = namedtuple("SorterEntry", ["sorter", "negate", "join_key"]) -def get_sorters(view, only_count, user_sort_parameter): - if only_count: - return [] - +def _get_sorters(view, user_sort_parameter): user_sorters = parse_url_sorters(user_sort_parameter) if user_sorters: sorter_list = user_sorters diff --git a/tests/unit/cmk/gui/test_views.py b/tests/unit/cmk/gui/test_views.py index 23c9f94..731cfed 100644 --- a/tests/unit/cmk/gui/test_views.py +++ b/tests/unit/cmk/gui/test_views.py @@ -5726,7 +5726,7 @@ def test_get_needed_regular_columns(register_builtin_html, load_view_plugins): view = cmk.gui.views.View(view_name, view_spec) - sorters = cmk.gui.views.get_sorters(view.spec, only_count=False, user_sort_parameter=None) + sorters = cmk.gui.views._get_sorters(view.spec, user_sort_parameter=None) group_cells = cmk.gui.views.get_group_cells(view.spec) cells = cmk.gui.views.get_cells(view.spec) @@ -5777,7 +5777,7 @@ def test_get_needed_join_columns(register_builtin_html, load_view_plugins): view = cmk.gui.views.View(view_name, view_spec) - sorters = cmk.gui.views.get_sorters(view.spec, only_count=False, user_sort_parameter=None) + sorters = cmk.gui.views._get_sorters(view.spec, user_sort_parameter=None) cells = cmk.gui.views.get_cells(view.spec) join_cells = cmk.gui.views.get_join_cells(cells)