From cde551bd551d1b7b77534777d151cb4cfe25ce53 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jordan=20Aug=C3=A9?= Date: Fri, 18 Oct 2013 18:31:40 +0200 Subject: [PATCH] portal.slicerequest: now send emails to PIs --- portal/actions.py | 10 +++++----- portal/slicerequestview.py | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/portal/actions.py b/portal/actions.py index 21b2563e..c66b10a3 100644 --- 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): - 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) - - 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) diff --git a/portal/slicerequestview.py b/portal/slicerequestview.py index 5f6c7861..d3c73d37 100644 --- 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) + 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 -- 2.43.0