git://git.onelab.eu
/
unfold.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7cfe5d7
)
Sending emails in actions.py
author
Loic Baron
<loic.baron@lip6.fr>
Tue, 28 Apr 2015 14:42:59 +0000
(16:42 +0200)
committer
Loic Baron
<loic.baron@lip6.fr>
Tue, 28 Apr 2015 14:42:59 +0000
(16:42 +0200)
portal/actions.py
patch
|
blob
|
history
diff --git
a/portal/actions.py
b/portal/actions.py
index
a6b33a5
..
cc4d988
100644
(file)
--- a/
portal/actions.py
+++ b/
portal/actions.py
@@
-891,6
+891,7
@@
def send_status_email(ctx, user_email, obj_type, status):
theme.template_name = obj_type + '_request_' + status + '.html'
html_content = render_to_string(theme.template, ctx)
theme.template_name = 'email_default_sender.txt'
theme.template_name = obj_type + '_request_' + status + '.html'
html_content = render_to_string(theme.template, ctx)
theme.template_name = 'email_default_sender.txt'
+
sender = render_to_string(theme.template, ctx)
sender = sender.replace('\n', '')
sender = render_to_string(theme.template, ctx)
sender = sender.replace('\n', '')
@@
-900,6
+901,7
@@
def send_status_email(ctx, user_email, obj_type, status):
msg.attach_alternative(html_content, "text/html")
msg.send()
except Exception as e:
msg.attach_alternative(html_content, "text/html")
msg.send()
except Exception as e:
+ print e
logger.error("Failed to send email, please check the mail templates and the SMTP configuration of your server")
logger.error("Failed to send email, please check the mail templates and the SMTP configuration of your server")
@@
-1049,9
+1051,10
@@
def send_email_to_pis(wsgi_request, request, obj_type):
theme.template_name = obj_type + '_request_email.html'
html_content = render_to_string(theme.template, request)
theme.template_name = obj_type + '_request_email.html'
html_content = render_to_string(theme.template, request)
- theme.template_name = obj_type + '_request_email_subject.txt'
- subject = render_to_string(theme.template, request)
- subject = subject.replace('\n', '')
+ #theme.template_name = obj_type + '_request_email_subject.txt'
+ #subject = render_to_string(theme.template, request)
+ #subject = subject.replace('\n', '')
+ subject = "New "+obj_type+" request"
theme.template_name = 'email_default_sender.txt'
sender = render_to_string(theme.template, request)
theme.template_name = 'email_default_sender.txt'
sender = render_to_string(theme.template, request)
@@
-1061,6
+1064,7
@@
def send_email_to_pis(wsgi_request, request, obj_type):
msg.attach_alternative(html_content, "text/html")
msg.send()
except Exception, e:
msg.attach_alternative(html_content, "text/html")
msg.send()
except Exception, e:
+ print e
print "Failed to send email, please check the mail templates and the SMTP configuration of your server"
print "Failed to send email, please check the mail templates and the SMTP configuration of your server"