[checkmk-commits] Check_MK Git: check_mk: FIX: Fix output of rule search:

chapters appeared twice sometimes Message-ID: &lt;515be101.xzOs0sFSsH5MSvub%mk(a)mathias-kettner.de&gt; User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: b0569bf59112e2bfc4cc2fbc972fdcc6d2f2e93b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b0569bf59112e2… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Wed Apr 3 09:54:18 2013 +0200 FIX: Fix output of rule search: chapters appeared twice sometimes Conflicts: web/htdocs/wato.py --- ChangeLog | 1 + web/.f12 | 2 +- web/htdocs/wato.py | 4 ++++ 3 files changed, 6 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 274f2bb..4d7e652 100644 --- a/ChangeLog +++ b/ChangeLog @@ -117,6 +117,7 @@ WATO: * FIX: Removed "No roles assigned" text in case of unlocked role attribute in user management dialog + * FIX: Fix output of rule search: chapters appeared twice sometimes Event Console: * FIX: check_mkevents: fix usage help if called with illegal options diff --git a/web/.f12 b/web/.f12 index f8ea798..f2d6c0e 100644 --- a/web/.f12 +++ b/web/.f12 @@ -1,6 +1,6 @@ #!/bin/bash SITE=${SITE:-$(omd sites --bare | head -n 1)} -C=$(sudo cp --preserve=mode -rv * /omd/sites/$SITE/share/check_mk/web/ | wc -l) +sudo rsync --exclude=defaults.py --delete -varx htdocs plugins /omd/sites/$SITE/share/check_mk/web/ echo "$C files copied" if [ "$SITE" != - ] ; then sudo omd restart $SITE apache diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 05243d7..1868304 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9767,6 +9767,10 @@ def mode_rulesets(phase): groupnames = [ gn for gn, rulesets in g_rulespec_groups if only_used or search != None or gn == group or gn.startswith(group + "/") ] + # In case of search we need to sort the groups since main chapters would + # appear more than once otherwise. + if search != None: + groupnames.sort() html.write('<div class=rulesets>')