[checkmk-commits] Check_MK Git: check_mk: #1868 "Successfully created the host"

message is also shown on host diagnose page now Message-ID: &lt;54be1a10.KMmec50AnwFyoYEu%lm(a)mathias-kettner.de&gt; User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: b8f8e2985a24f4df951db7af147db0adfb175d7b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b8f8e2985a24f4… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Tue Jan 20 08:37:59 2015 +0100 #1868 "Successfully created the host" message is also shown on host diagnose page now --- .werks/1868 | 9 +++++++++ ChangeLog | 1 + web/htdocs/wato.py | 14 +++++++------- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/.werks/1868 b/.werks/1868 new file mode 100644 index 0000000..57d8a75 --- /dev/null +++ b/.werks/1868 @@ -0,0 +1,9 @@ +Title: "Successfully created the host" message is also shown on host diagnose page now +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.7i1 +Date: 1421739446 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index de00fd3..9c673cd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -114,6 +114,7 @@ * 1760 Added search form to manual checks page * 1785 Upload SNMP MIBs via WATO... * 1461 msexch_dag.copyqueue: added a WATO rule for this check + * 1868 "Successfully created the host" message is also shown on host diagnose page now * 1761 FIX: Ruleset search is now consistent for host & serviceparameters and manual checks * 1765 FIX: Fixed bug when generating nagvis backends while having sites with livestatus proxy configured... * 1789 FIX: Fix preview of passive checks in WATO list of services diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 9aba1dd..e4848e4 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2061,20 +2061,20 @@ def mode_edithost(phase, new, cluster): return elif new: if host.get('tag_agent') != 'ping': - create_result = 'folder', _('Successfully created the host. Now you should do a ' - '<a href="%s">service discovery</a> in order to auto-configure ' - 'all services to be checked on this host.') % \ - make_link([("mode", "inventory"), ("host", hostname)]) + create_msg = _('Successfully created the host. Now you should do a ' + '<a href="%s">service discovery</a> in order to auto-configure ' + 'all services to be checked on this host.') % \ + make_link([("mode", "inventory"), ("host", hostname)]) else: - create_result = 'folder' + create_msg = None if go_to_services: return "firstinventory" elif go_to_diag: html.set_var("_try", "1") - return "diag_host" + return "diag_host", create_msg else: - return create_result + return "folder", create_msg else: if go_to_services: return "inventory"