[checkmk-commits] fixed recently introduced bug on merging WK6676

Andreas Boesl ab at mathias-kettner.de
Thu Nov 8 11:50:34 CET 2018


Module: check_mk
Branch: master
Commit: e20681320b0ef7cc72bdb148462ae2e7c0795b68
URL:    http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e20681320b0ef7cc72bdb148462ae2e7c0795b68

Author: Andreas Boesl <ab at mathias-kettner.de>
Date:   Thu Nov  8 11:48:03 2018 +0100

fixed recently introduced bug on merging WK6676

Change-Id: Ic3fdb4cb3611c0e08ff7425e79615110d22910c9

---

 cmk/gui/plugins/webapi/webapi.py | 2 +-
 cmk/gui/watolib.py               | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/cmk/gui/plugins/webapi/webapi.py b/cmk/gui/plugins/webapi/webapi.py
index eaa4c54..31a52ff 100644
--- a/cmk/gui/plugins/webapi/webapi.py
+++ b/cmk/gui/plugins/webapi/webapi.py
@@ -782,7 +782,7 @@ class APICallHosttags(APICallCollection):
 
     def _get_builtin_tags_configuration(self):
         builtin_tags_config = watolib.BuiltinHosttagsConfiguration()
-        builtin_tags_config.parse_config((watolib.builtin_host_tags, watolib.builtin_aux_tags))
+        builtin_tags_config.load()
         return builtin_tags_config.get_dict_format()
 
     def _set(self, request):
diff --git a/cmk/gui/watolib.py b/cmk/gui/watolib.py
index aa77d87..a0c73f4 100644
--- a/cmk/gui/watolib.py
+++ b/cmk/gui/watolib.py
@@ -7317,6 +7317,10 @@ class BuiltinHosttagsConfiguration(HosttagsConfiguration):
     def insert_tag_group(self, tag_group):
         self._insert_tag_group(tag_group)
 
+    def load(self):
+        builtin_tags = config.BuiltinTags()
+        self._parse_legacy_format(builtin_tags.host_tags(), builtin_tags.aux_tags())
+
 #.
 #   .--Hooks---------------------------------------------------------------.
 #   |                     _   _             _                              |



More information about the checkmk-commits mailing list