[checkmk-commits] 3270 FIX Fix button [Deprecated Rulesets] within deprecated manual checks rulesets

Module: check_mk Branch: master Commit: 692c14713917e6c7da8bd3b3b30904ccac394be3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=692c14713917e6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 10 13:21:33 2016 +0100 3270 FIX Fix button [Deprecated Rulesets] within deprecated manual checks rulesets --- .werks/3270 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 8 ++++++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.werks/3270 b/.werks/3270 new file mode 100644 index 0000000..d9346eb --- /dev/null +++ b/.werks/3270 @@ -0,0 +1,10 @@ +Title: Fix button [Deprecated Rulesets] within deprecated manual checks rulesets +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1457612462 + + diff --git a/ChangeLog b/ChangeLog index 179a138..8c752fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -121,6 +121,7 @@ * 3005 FIX: webapi: now able to add new hosts to main folder (bug was introduced recently) * 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 Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 1e025b1..b6ee5a5 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -11890,8 +11890,12 @@ def mode_rulesets(phase, group=None): if group != "static": html.context_button(_("All Rulesets"), folder_preserving_link([("mode", "ruleeditor")]), "back") else: - html.context_button(_("Deprecated Rulesets"), - folder_preserving_link([("mode", "rulesets"), ("group", "static"), ("deprecated", "1")]), "rulesets_deprecated") + if show_deprecated: + html.context_button(_("Normal Rulesets"), + folder_preserving_link([("mode", "rulesets"), ("group", "static"), ("deprecated", "0")]), "rulesets") + else: + html.context_button(_("Deprecated Rulesets"), + folder_preserving_link([("mode", "rulesets"), ("group", "static"), ("deprecated", "1")]), "rulesets_deprecated") if config.may("wato.hosts") or config.may("wato.seeall"): html.context_button(_("Folder"), folder_preserving_link([("mode", "folder")]), "folder") if group == "agents":