portal.slicerequest: now send emails to PIs

diff --git a/portal/actions.py b/portal/actions.py
index 21b2563..c66b10a 100644 (file)
--- a/portal/actions.py
+++ b/portal/actions.py
@@ -18,12 +18,12 @@ def authority_get_pis(request, authority_hrn):
     return results
 
 def authority_get_pi_emails(request,authority_hrn):
     return results
 
 def authority_get_pi_emails(request,authority_hrn):

-    user_hrns = authority_get_pis(request,authority_hrn)
-    
-    query = Query.get('user').filter_by('user_hrn', 'included', user_hrns).select('user_email')
+    pi_users = authority_get_pis(request,authority_hrn)
+    pi_user_hrns = [ hrn for x in pi_users for hrn in x['pi_users'] ]
+    query = Query.get('user').filter_by('user_hrn', 'included', pi_user_hrns).select('email')

     results = execute_query(request,query)
     results = execute_query(request,query)

-    
-    return [result['user_email'] for result in results]
+    print "mails",  [result['email'] for result in results]
+    return [result['email'] for result in results]

 
 # SFA add record (user, slice)
 
 
 # SFA add record (user, slice)
 

diff --git a/portal/slicerequestview.py b/portal/slicerequestview.py
index 5f6c786..d3c73d3 100644 (file)
--- a/portal/slicerequestview.py
+++ b/portal/slicerequestview.py
@@ -63,6 +63,7 @@ class SliceRequestView (LoginRequiredAutoLogoutView):
             if cc_myself:
                 recipients.append(email)
             msg = render_to_string('slice-request-email.txt', form.cleaned_data)
             if cc_myself:
                 recipients.append(email)
             msg = render_to_string('slice-request-email.txt', form.cleaned_data)

+            print "email, msg, email, recipients", email , msg, email, recipients 

             send_mail("Onelab user %s requested a slice"%email , msg, email, recipients)
 
             return render(request,'slice-request-ack-view.html') # Redirect after POST
             send_mail("Onelab user %s requested a slice"%email , msg, email, recipients)
 
             return render(request,'slice-request-ack-view.html') # Redirect after POST