[checkmk-commits] Check_MK Git: check_mk: Fixed setting of attributes when creating a new folder

Module: check_mk Branch: master Commit: 4f56eadb9a5297ad9d2561734c4a5e0a955a145c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f56eadb9a5297… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 8 16:39:23 2014 +0100 Fixed setting of attributes when creating a new folder Attributes had been saved in the parent folder instead of the folder itself. This was due to a bug fix from last week. --- web/htdocs/wato.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index e2fcadf..7d3ec85 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1804,10 +1804,7 @@ def mode_editfolder(phase, new): if new: check_folder_permissions(g_folder, "write") check_user_contactgroups(attributes.get("contactgroups", (False, []))) - create_wato_folder(g_folder, name, title) - g_folder["attributes"] = attributes - save_folder(g_folder) - log_audit(g_folder, "new-folder", _("Created new folder %s") % title) + create_wato_folder(g_folder, name, title, attributes) else: # TODO: migrate this block into own function edit_wato_folder(..) @@ -17535,7 +17532,7 @@ def create_wato_folders(path): # Creates and returns an empty wato folder with the given title # Write permissions are NOT checked! -def create_wato_folder(parent, name, title): +def create_wato_folder(parent, name, title, attributes={}): if parent and parent[".path"]: newpath = parent[".path"] + "/" + name else: @@ -17545,7 +17542,7 @@ def create_wato_folder(parent, name, title): ".name" : name, ".path" : newpath, "title" : title or name, - "attributes" : {}, + "attributes" : attributes, ".folders" : {}, ".hosts" : {}, "num_hosts" : 0,