Merge branch 'fibre' of ssh://git.onelab.eu/git/myslice into fibre

[unfold.git] / portal / actions.py

diff --git a/portal/actions.py b/portal/actions.py
index 5f17385..689e0f1 100644 (file)
--- a/portal/actions.py
+++ b/portal/actions.py
@@ -153,6 +153,10 @@ def manifold_add_user(wsgi_request, request):
         ?
     
     """
+
+    authority_hrn = request['authority_hrn']
+    request['authority_hrn'] = authority_hrn.split(".")[0]
+
     USER_CONFIG = '{"firstname": "%(first_name)s", "lastname": "%(last_name)s", "authority": "%(authority_hrn)s"}'
 
     user_params = {
@@ -162,6 +166,8 @@ def manifold_add_user(wsgi_request, request):
         'status'    : 1,
     }
 
+    request['authority_hrn'] = authority_hrn
+
     query = Query.create('local:user').set(user_params).select('email')
     results = execute_admin_query(request, query)
     if not results:
@@ -473,7 +479,11 @@ def create_pending_slice(wsgi_request, request, email):
         subject = render_to_string(theme.template, request)
         subject = subject.replace('\n', '')
     
-        sender = email
+        theme.template_name = 'email_default_sender.txt'
+        sender =  render_to_string(theme.template, request)
+        sender = sender.replace('\n', '')
+
+        #sender = email
         msg = EmailMultiAlternatives(subject, text_content, sender, recipients)
         msg.attach_alternative(html_content, "text/html")
         msg.send()
@@ -560,7 +570,7 @@ def sfa_create_user(wsgi_request, request):
     else:
         subject = 'User validated'
         msg = 'A manager of your institution has validated your account. You have now full user access to the portal.'
-        send_mail(subject, msg, 'support@onelab.eu',[request['email']], fail_silently=False)       
+        send_mail(subject, msg, 'support@fibre.org.br',[request['email']], fail_silently=False)       
     return results
 
 def ldap_create_user(wsgi_request, request, user_detail):
@@ -819,7 +829,10 @@ def create_pending_user(wsgi_request, request, user_detail):
     try:
         # Send an email: the recipients are the PI of the authority
         # If No PI is defined for this Authority, send to a default email (different for each theme)
-        recipients = authority_get_pi_emails(wsgi_request, request['authority_hrn'])
+
+        split_authority_hrn = request['authority_hrn'].split(".")[0]
+
+        recipients = authority_get_pi_emails(wsgi_request, split_authority_hrn)
         
         theme.template_name = 'user_request_email.html'
         html_content = render_to_string(theme.template, request)