[checkmk-commits] 5848 FIX Fixed broken inheritance of agent type set on folders ( regression in 1.5.0i2)

Module: check_mk Branch: master Commit: a68f01ec8da0e1a512531474271b7f67db78efec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a68f01ec8da0e1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 19 14:00:27 2018 +0100 5848 FIX Fixed broken inheritance of agent type set on folders (regression in 1.5.0i2) When the "agent type" property was set on a folder, this setting was not correctly inherited to the hosts. This broke with werk #5535. Change-Id: I0054882c070d4d2758c72395338a0dc9eb6aa081 --- .werks/5848 | 11 +++++++++++ web/htdocs/watolib.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/5848 b/.werks/5848 new file mode 100644 index 0000000..b4345d2 --- /dev/null +++ b/.werks/5848 @@ -0,0 +1,11 @@ +Title: Fixed broken inheritance of agent type set on folders (regression in 1.5.0i2) +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1519045062 +Class: fix + +When the "agent type" property was set on a folder, this setting was not correctly +inherited to the hosts. This broke with werk #5535. diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index f650544..a1ed619 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -1582,7 +1582,7 @@ class CREFolder(BaseFolder): def _load(self): wato_info = self._load_wato_info() self._title = wato_info.get("title", self._fallback_title()) - self._attributes = wato_info.get("attributes", {}) + self._attributes = self._transform_old_agent_type_in_attributes(wato_info.get("attributes", {})) self._locked = wato_info.get("lock", False) self._locked_subfolders = wato_info.get("lock_subfolders", False)