From d037ae2354be534605d36d03922995ba78af77c2 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 8 Jun 2020 17:44:00 +0200 Subject: [PATCH] fixing messaging --- rowers/tasks.py | 6 ++++-- rowers/templates/virtualracemessage.html | 4 ++++ rowers/templatetags/rowerfilters.py | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/rowers/tasks.py b/rowers/tasks.py index f1eb59d8..405434d4 100644 --- a/rowers/tasks.py +++ b/rowers/tasks.py @@ -2336,14 +2336,16 @@ def handle_sendemailnewcomment(first_name, @app.task def handle_send_template_email(template,email,fromemail,rowername, subject,message,debug=False,**kwargs): + fullemail = [email] d = { 'message':message, 'rowername':rowername, } - res = send_template_email(fromemail,fullemail,subject, - template,d,**kwargs) + res = send_template_email('Rowsandall ', + fullemail,subject, + template,d,cc=[fromemail],**kwargs) @app.task def handle_sendemail_message(email,fromemail,rowername,message,teamname,managername, diff --git a/rowers/templates/virtualracemessage.html b/rowers/templates/virtualracemessage.html index 0319f093..33d03a1b 100644 --- a/rowers/templates/virtualracemessage.html +++ b/rowers/templates/virtualracemessage.html @@ -6,5 +6,9 @@ {{ message }}

+

+ This email was sent on behalf of the challenge organizer, who was copied on this message. +

+ {% endblock %} diff --git a/rowers/templatetags/rowerfilters.py b/rowers/templatetags/rowerfilters.py index b8532593..b43268c0 100644 --- a/rowers/templatetags/rowerfilters.py +++ b/rowers/templatetags/rowerfilters.py @@ -112,7 +112,7 @@ def sigdig(value, digits = 3): return value places = digits - order - 1 - print(places,digits,order) + if places > 0: fmtstr = "%%.%df" % (places) else: