[checkmk-commits] #3169 FIX Permission/ Contact group settings for new hosts did show folder options

Module: check_mk Branch: master Commit: e8691b0142957c42fa63fe5a3f2209eb4a74519f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e8691b0142957c… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Sun Feb 7 21:43:56 2016 +0100 #3169 FIX Permission/Contact group settings for new hosts did show folder options When creating a new host in WATO the section <i>Permissions</i> would show settings that are meant for folders. This has been fixed (when editing an existing host the correct options were displayed). --- .bugs/2383 | 7 +++++-- .werks/3169 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/watolib.py | 2 +- 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.bugs/2383 b/.bugs/2383 index 90f7a01..c8fd721 100644 --- a/.bugs/2383 +++ b/.bugs/2383 @@ -1,9 +1,9 @@ Title: WATO dialog for host creation shows folder contact group attributes Component: wato -State: open +Class: bug +State: done Date: 2015-10-30 10:16:25 Targetversion: 1.2.8 -Class: bug Permissions.. @@ -19,3 +19,6 @@ But this was the dialog of a new *host*, not folder. In *edit*-Mode of a host this is OK and the correct check boxes are being displayed. + +2016-02-07 21:42:17: changed state open -> done +Fixed. diff --git a/.werks/3169 b/.werks/3169 new file mode 100644 index 0000000..6884b5c --- /dev/null +++ b/.werks/3169 @@ -0,0 +1,11 @@ +Title: Permission/Contact group settings for new hosts did show folder options +Level: 2 +Component: wato +Compatible: compat +Version: 1.2.7i4 +Date: 1454877739 +Class: fix + +When creating a new host in WATO the section <i>Permissions</i> would show +settings that are meant for folders. This has been fixed (when editing an +existing host the correct options were displayed). diff --git a/ChangeLog b/ChangeLog index 8e58929..233859b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -348,6 +348,7 @@ * 3036 FIX: Bulk discovery steps are now timing out short before HTTP request timeout... * 3038 FIX: Fixed invalid error message when creating service group assignment rule without having service groups * 3044 FIX: Fixed garbled notifications page on page reload after an action has been performed + * 3169 FIX: Permission/Contact group settings for new hosts did show folder options... Notifications: * 2811 Mail notifications: Now able to add Host/Service Notes Url... diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index e2f036e..007e333 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -2590,7 +2590,7 @@ class ContactGroupsAttribute(Attribute): # If we're just editing a host, then some of the checkboxes will be missing. # This condition is not very clean, but there is no other way to savely determine # the context. - is_host = not not html.var("host") + is_host = not not html.var("host") or html.var("mode") == "newhost" is_search = varprefix == "host_search" # Only show contact groups I'm currently in and contact