[checkmk-commits] 3450 FIX Site properties: It was not possible to switch a site back to " local site" connection

Module: check_mk Branch: master Commit: 51c12f7e6639cd2755cfde460905a7096e05c160 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=51c12f7e6639cd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 2 08:47:24 2016 +0200 3450 FIX Site properties: It was not possible to switch a site back to "local site" connection --- .werks/3450 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3450 b/.werks/3450 new file mode 100644 index 0000000..07953a1 --- /dev/null +++ b/.werks/3450 @@ -0,0 +1,10 @@ +Title: Site properties: It was not possible to switch a site back to "local site" connection +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1462171612 + + diff --git a/ChangeLog b/ChangeLog index b31bbdd..ca39c73 100644 --- a/ChangeLog +++ b/ChangeLog @@ -328,6 +328,7 @@ * 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 * 3383 FIX: Host search: Don't preselect any optional field (Searched for empty values) + * 3450 FIX: Site properties: It was not possible to switch a site back to "local site" connection Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 59649c1..3969f91 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9246,7 +9246,7 @@ def mode_edit_site(phase): # are not edited with this dialog if not new: for key in old_site.keys(): - if key not in new_site: + if key not in new_site and key != "socket": new_site[key] = old_site[key] save_sites(configured_sites)