[checkmk-commits] 3382 FIX Fixed exception when moving multiple folder levels to another folder

Module: check_mk Branch: master Commit: 2fc4bddb0ac245921563dc94a9875f2c72fa28a0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2fc4bddb0ac245… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 15 16:39:22 2016 +0200 3382 FIX Fixed exception when moving multiple folder levels to another folder --- .werks/3382 | 9 +++++++++ ChangeLog | 1 + web/htdocs/watolib.py | 3 ++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3382 b/.werks/3382 new file mode 100644 index 0000000..9a830f6 --- /dev/null +++ b/.werks/3382 @@ -0,0 +1,9 @@ +Title: Fixed exception when moving multiple folder levels to another folder +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1460731130 + diff --git a/ChangeLog b/ChangeLog index 228ec0a..5737b1b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -273,6 +273,7 @@ * 3378 FIX: Fixed too long contact group names overflowing WATO folders * 3379 FIX: Fixed error resotring WATO snapshot without Check_MK configuration * 3381 FIX: Folder property editing: Redirect back to folder when coming from folder + * 3382 FIX: Fixed exception when moving multiple folder levels to another folder Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index af88693..7b87839 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -1330,8 +1330,9 @@ class Folder(BaseFolder): self.need_unlocked() self.need_unlocked_subfolders() self.need_unlocked_hosts() + for subfolder in self.subfolders().values(): - subfolder.need_recursive_write_permission(how) + subfolder.need_recursive_permission(how) def need_unlocked(self):