[checkmk-commits] 3547 FIX Deleting a subfolder now generates a correct audit message

Module: check_mk Branch: master Commit: c44b32c68482a75651c1aa1ba8efd486bf6d2a9a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c44b32c68482a7… Author: Andreas Boesl &lt;ab(a)mathias-kettner.de&gt; Date: Mon Jun 20 13:56:10 2016 +0200 3547 FIX Deleting a subfolder now generates a correct audit message The subfolders name was skipped in the audit message. Instead of <i>Deleted folder Main directory/myfolder/otherfolder</i> it showed <i>Deleted folder Main direcotry/myfolder</i>. --- .werks/3547 | 12 ++++++++++++ ChangeLog | 1 + web/htdocs/watolib.py | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/3547 b/.werks/3547 new file mode 100644 index 0000000..257dcb3 --- /dev/null +++ b/.werks/3547 @@ -0,0 +1,12 @@ +Title: Deleting a subfolder now generates a correct audit message +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1466423596 + +The subfolders name was skipped in the audit message. +Instead of <i>Deleted folder Main directory/myfolder/otherfolder</i> it +showed <i>Deleted folder Main direcotry/myfolder</i>. diff --git a/ChangeLog b/ChangeLog index 7d18f3c..aae9674 100644 --- a/ChangeLog +++ b/ChangeLog @@ -442,6 +442,7 @@ * 3583 FIX: Fixed loosing some services after saving services in WATO... * 3588 FIX: BI aggregation: Fixed folding of tag groups in aggregation rules using host/service searches * 3620 FIX: Do not longer put SNMP MIB files into WATO snapshots... + * 3547 FIX: Deleting a subfolder now generates a correct audit message... Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 64ecd27..ca916f8 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -1499,7 +1499,7 @@ class Folder(BaseFolder): subfolder = self.subfolder(name) subfolder.mark_hosts_dirty() call_hook_folder_deleted(subfolder) - log_pending(AFFECTED, self, "delete-folder", _("Deleted folder %s") % self.alias_path()) + log_pending(AFFECTED, self, "delete-folder", _("Deleted folder %s") % subfolder.alias_path()) self._remove_subfolder(name) shutil.rmtree(subfolder.filesystem_path()) Folder.invalidate_caches()