[checkmk-commits] Moved similar functions together

Module: check_mk Branch: master Commit: 058ada7e777bf2b6dcf9e441f6d47722d2caaddb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=058ada7e777bf2… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Thu Sep 8 16:32:01 2016 +0200 Moved similar functions together --- web/htdocs/wato.py | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 7c3cead..d1f221f 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -871,7 +871,7 @@ def delete_host_files(site_id, hostname): # TODO: See bug #2414 check_mk_automation(site_id, "delete-host", [hostname]) if not config.site_is_local(site_id): - # Delete inventory data from remote sites (not the archive) + # Delete inventory data received from remote sites (not the archive) for filename in [ "%s/inventory/%s" % (defaults.var_dir, hostname), "%s/inventory/%s.gz" % (defaults.var_dir, hostname) ]: if os.path.exists(filename): @@ -879,6 +879,19 @@ def delete_host_files(site_id, hostname): log_pending(AFFECTED, hostname, "delete-host", _("Deleted host %s") % hostname) +def delete_host_after_confirm(delname): + c = wato_confirm(_("Confirm host deletion"), + _("Do you really want to delete the host <tt>%s</tt>?") % delname) + if c: + Folder.current().delete_hosts([delname]) + # Delete host files + return "folder" + elif c == False: # not yet confirmed + return "" + else: + return None # browser reload + + def delete_hosts_after_confirm(host_names): c = wato_confirm(_("Confirm deletion of %d hosts") % len(host_names), _("Do you really want to delete the %d selected hosts?") % len(host_names)) @@ -1409,18 +1422,6 @@ def validate_host_uniqueness(host_name): (host_name, host.folder().url(), host.folder().alias_path())) -def delete_host_after_confirm(delname): - c = wato_confirm(_("Confirm host deletion"), - _("Do you really want to delete the host <tt>%s</tt>?") % delname) - if c: - Folder.current().delete_hosts([delname]) - return "folder" - elif c == False: # not yet confirmed - return "" - else: - return None # browser reload - - def check_new_host_name(varname, host_name): if not host_name: raise MKUserError(varname, _("Please specify a host name."))