[checkmk-commits] 3100 FIX fixed exception when trying to create a wato folder when that folder already exists

Module: check_mk Branch: master Commit: 7cb51b792f1339f9c79d1c35edc94a40641e8cd2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7cb51b792f1339… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Mar 15 13:28:32 2016 +0100 3100 FIX fixed exception when trying to create a wato folder when that folder already exists --- .werks/3100 | 9 +++++++++ ChangeLog | 1 + web/htdocs/watolib.py | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/3100 b/.werks/3100 new file mode 100644 index 0000000..01259a6 --- /dev/null +++ b/.werks/3100 @@ -0,0 +1,9 @@ +Title: fixed exception when trying to create a wato folder when that folder already exists +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1458044804 + diff --git a/ChangeLog b/ChangeLog index 8d9191a..d82beae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -131,6 +131,7 @@ * 3283 FIX: Bulk import of hosts: It is now possible again to import a simple list of hosts... * 3284 FIX: Bulk import of hosts: Fixed disabling of reading first line as header... * 3270 FIX: Fix button [Deprecated Rulesets] within deprecated manual checks rulesets + * 3100 FIX: fixed exception when trying to create a wato folder when that folder already exists Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index b6536f0..e0e8ccc 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -4517,7 +4517,7 @@ def must_be_in_contactgroups(cgspec): def check_wato_foldername(htmlvarname, name, just_name = False): - if not just_name and name in Folder.current().has_subfolder(name): + if not just_name and Folder.current().has_subfolder(name): raise MKUserError(htmlvarname, _("A folder with that name already exists.")) if not name: