[checkmk-commits] Check_MK Git: check_mk: FIX Fix broken Site status switching via sidebar snapin

Module: check_mk Branch: master Commit: 64d90c8fce3c97b4848b855be0db12defba3d6e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=64d90c8fce3c97… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Thu Dec 19 15:22:29 2013 +0100 FIX Fix broken Site status switching via sidebar snapin The bug was introduced in 1.2.4b1 due to the new handling (and avoiding) of unneccessary livestatus connects. --- .werks/436 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/main.py | 8 ++++---- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.werks/436 b/.werks/436 new file mode 100644 index 0000000..e70d293 --- /dev/null +++ b/.werks/436 @@ -0,0 +1,11 @@ +Title: Fix broken Site status switching via sidebar snapin +Level: 2 +Component: multisite +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387462864 +Targetversion: future + +The bug was introduced in 1.2.4b1 due to the new handling +(and avoiding) of unneccessary livestatus connects. diff --git a/ChangeLog b/ChangeLog index 3d213c0..d6f450b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -92,6 +92,7 @@ * 0246 FIX: brocade_fcport: fixed error in pnp-template... * 0393 FIX: LDAP: Enabled paged LDAP search by default now with a page size of 1000... * 0394 FIX: LDAP: Auth expiration plugin now checks users for being disabled (in AD)... + * 0436 FIX: Fix broken Site status switching via sidebar snapin... WATO: * 0308 Multisite can now set rotation view permissions for NagVis... diff --git a/web/htdocs/main.py b/web/htdocs/main.py index a01a82f..c0e4815 100644 --- a/web/htdocs/main.py +++ b/web/htdocs/main.py @@ -50,8 +50,8 @@ def page_index(): </html> """ % (heading, start_url)) -# This function does nothing. The sites have already -# been reconfigured according to the variable _site_switch, -# because that variable is processed by connect_to_livestatus() +# This function does almost nothing. It just makes sure that +# a livestatus-connection is built up, since connect_to_livestatus() +# handles the _site_switch variable. def ajax_switch_site(): - pass + html.live