[checkmk-commits] Moved join_columns to join implementation

Module: check_mk Branch: master Commit: 802aa0a1936274630d2b40531e327787be9b709d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=802aa0a1936274… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 4 19:54:04 2019 +0100 Moved join_columns to join implementation Change-Id: I3ed2b1a62dde6ed2a9dd3e8b5969a08da736ea5d --- cmk/gui/views.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cmk/gui/views.py b/cmk/gui/views.py index f3d9b17..033e7ee 100644 --- a/cmk/gui/views.py +++ b/cmk/gui/views.py @@ -1317,7 +1317,6 @@ def show_view(view, view_renderer, only_count=False): # Prepare cells of the view group_cells = view.group_cells cells = view.row_cells - join_cells = view.join_cells # Now compute the list of all columns we need to query via Livestatus. # Those are: (1) columns used by the sorters in use, (2) columns use by @@ -1326,7 +1325,6 @@ def show_view(view, view_renderer, only_count=False): # is the trickiest. Also compute this list of view options use by the # painters columns = _get_needed_regular_columns(group_cells + cells, sorters, view.datasource) - join_columns = _get_needed_join_columns(join_cells, sorters) # Fetch data. Some views show data only after pressing [Search] if (only_count or (not view.spec.get("mustsearch")) or @@ -1335,8 +1333,8 @@ def show_view(view, view_renderer, only_count=False): all_active_filters) # Now add join information, if there are join columns - if join_cells: - _do_table_join(view, rows, filterheaders, join_cells, join_columns) + if view.join_cells: + _do_table_join(view, rows, filterheaders, sorters) # If any painter, sorter or filter needs the information about the host's # inventory, then we load it and attach it as column "host_inventory" @@ -1494,10 +1492,12 @@ def columns_of_cells(cells): return columns -def _do_table_join(view, master_rows, master_filters, join_cells, join_columns): +def _do_table_join(view, master_rows, master_filters, sorters): join_table, join_master_column = view.datasource.join slave_ds = data_source_registry[join_table]() join_slave_column = slave_ds.join_key + join_cells = view.join_cells + join_columns = _get_needed_join_columns(join_cells, sorters) # Create additional filters join_filters = []