[checkmk-commits] Fix for werk #4886

Module: check_mk Branch: master Commit: 3e20bfe6e8438e259b3c834239a92082da48d41a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3e20bfe6e8438e… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Wed May 2 11:29:08 2018 +0200 Fix for werk #4886 Change-Id: Ib54bda08203c6b758de52c80f73015c1dceff8e2 --- web/plugins/wato/notifications.py | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/web/plugins/wato/notifications.py b/web/plugins/wato/notifications.py index e4c12fc..251597d 100644 --- a/web/plugins/wato/notifications.py +++ b/web/plugins/wato/notifications.py @@ -24,28 +24,30 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. + # We have to transform because 'add_to_event_context' # in modules/events.py can't handle complex data structures def transform_back_html_mail_url_prefix(p): if type(p) == tuple: return {p[0]: p[1]} - elif p == "automatic_http": + if p == "automatic_http": return {"automatic": "http"} - elif p == "automatic_https": + if p == "automatic_https": return {"automatic": "https"} - else: - return {"manual": p} + return {"manual": p} + def transform_forth_html_mail_url_prefix(p): - if type(p) == dict: - k, v = p.items()[0] - if k == "automatic": - return "%s_%s" % (k, v) - else: - return ("manual", p) - else: + if type(p) != dict: return ("manual", p) + k, v = p.items()[0] + if k == "automatic": + return "%s_%s" % (k, v) + + return ("manual", v) + + def html_email_parameter_elements(): elements = [ ( "from",