From: Yasin <mohammed-yasin.rahman@lip6.fr>
Date: Wed, 18 Jun 2014 14:04:38 +0000 (+0200)
Subject: f4f changes
X-Git-Tag: myslice-1.1~64^2~3
X-Git-Url: http://git.onelab.eu/?p=unfold.git;a=commitdiff_plain;h=dc5dc68e237f827215ba39b24658b5fa6d7f7ba2

f4f changes
---

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