Module: check_mk
Branch: master
Commit: b847a256d01667bf98cb8bf1b55681df46ad8ea4
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b847a256d01667…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Mar 27 16:57:04 2019 +0100
Cleanup unused "path" key in rule dict representation
Change-Id: I07a9444535b900eed18874bbe950eaed9fef9a07
---
cmk/gui/plugins/webapi/webapi.py | 6 +-----
cmk/gui/watolib/rulesets.py | 1 -
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/cmk/gui/plugins/webapi/webapi.py b/cmk/gui/plugins/webapi/webapi.py
index fcb478e..c64cdfc 100644
--- a/cmk/gui/plugins/webapi/webapi.py
+++ b/cmk/gui/plugins/webapi/webapi.py
@@ -634,11 +634,7 @@ class APICallRules(APICallCollection):
ruleset_dict = {}
for folder, _rule_index, rule in ruleset.get_rules():
- ruleset_dict.setdefault(folder.path(), [])
- # The path is already set in the folder hierarchy
- rule_config = rule.to_dict_config()
- del rule_config["path"]
- ruleset_dict[folder.path()].append(rule_config)
+ ruleset_dict.setdefault(folder.path(), []).append(rule.to_dict_config())
return ruleset_dict
diff --git a/cmk/gui/watolib/rulesets.py b/cmk/gui/watolib/rulesets.py
index 68a2a2e..a782c9e 100644
--- a/cmk/gui/watolib/rulesets.py
+++ b/cmk/gui/watolib/rulesets.py
@@ -703,7 +703,6 @@ class Rule(object):
def to_dict_config(self):
result = {"conditions": {}}
- result["path"] = self.folder.path()
result["options"] = self._rule_options_to_config()
if self.ruleset.valuespec():