From: Yasin Date: Wed, 18 Jun 2014 14:04:50 +0000 (+0200) Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab X-Git-Tag: myslice-1.1~64^2~2 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=d83ecca68ff1f28974315c4a154417dc17cbe0cb;hp=4956db5b73c760e061c517f93f2329cd2f7b5bbc;p=myslice.git Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab --- diff --git a/portal/actions.py b/portal/actions.py index 648ae57b..e68bd3f4 100644 --- a/portal/actions.py +++ b/portal/actions.py @@ -551,7 +551,10 @@ def create_pending_user(wsgi_request, request, user_detail): theme.template_name = 'activate_user_email_subject.txt' subject = render_to_string(theme.template, request) subject = subject.replace('\n', '') - sender = 'support@myslice.info' + #sender = 'support@myslice.info' + theme.template_name = 'email_default_sender.txt' + sender = render_to_string(theme.template, request) + sender = sender.replace('\n', '') recipient = [request['email']] #recipient = recipient.append(request['email']) diff --git a/portal/templates/fed4fire/fed4fire_email_default_sender.txt b/portal/templates/fed4fire/fed4fire_email_default_sender.txt new file mode 100644 index 00000000..c7ab51cd --- /dev/null +++ b/portal/templates/fed4fire/fed4fire_email_default_sender.txt @@ -0,0 +1 @@ +contact@fed4fire.eu