[checkmk-commits] 6377 FIX Bulk discovery was not taking selected options into account

Module: check_mk Branch: master Commit: dca1ee673060372c2595feab37c8bb2c29614499 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dca1ee67306037… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 31 11:13:50 2018 +0200 6377 FIX Bulk discovery was not taking selected options into account The options selected to be performed during bulk discovery were not used correctly. For example the operation mode was always "Add unmonitored services", even when other options were selected. Change-Id: Ide87377138fefef0eb21743adf21a782e75b9dec --- .werks/6377 | 13 +++++++++++++ cmk/gui/wato/__init__.py | 4 +++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.werks/6377 b/.werks/6377 new file mode 100644 index 0000000..0026c92 --- /dev/null +++ b/.werks/6377 @@ -0,0 +1,13 @@ +Title: Bulk discovery was not taking selected options into account +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1532945549 + +The options selected to be performed during bulk discovery were not +used correctly. For example the operation mode was always "Add unmonitored services", +even when other options were selected. diff --git a/cmk/gui/wato/__init__.py b/cmk/gui/wato/__init__.py index 3032a82..e21d4c8 100644 --- a/cmk/gui/wato/__init__.py +++ b/cmk/gui/wato/__init__.py @@ -4502,7 +4502,9 @@ class ModeBulkDiscovery(WatoMode): def _get_bulk_discovery_params(self): self._bulk_discovery_params = copy.deepcopy(config.bulk_discovery_default_settings) - if self._start: + # start : Rendering of the progress dialog + # transaction : Single step processing + if self._start or html.is_transaction(): bulk_discover_params = cmk.gui.plugins.wato.vs_bulk_discovery.from_html_vars("bulkinventory") cmk.gui.plugins.wato.vs_bulk_discovery.validate_value(bulk_discover_params, "bulkinventory") self._bulk_discovery_params.update(bulk_discover_params)