X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fregistrationview.py;h=f18726ef07e2d73c269f9e532d2a1d85e3033c07;hb=d1f853ba9b7438c86a786f523d84238491d9ee6a;hp=30a0ed39500ea1633c31c1c94ab6d2032e81120e;hpb=937653fd70bbf7d95bcf870e7f2b46b4a8fec486;p=myslice.git diff --git a/portal/registrationview.py b/portal/registrationview.py index 30a0ed39..f18726ef 100644 --- a/portal/registrationview.py +++ b/portal/registrationview.py @@ -11,6 +11,9 @@ from myslice.viewutils import topmenu_items from manifold.manifoldapi import execute_query from manifold.core.query import Query +from portal.models import PendingUser +from portal.actions import authority_get_pi_emails + # This is a rough porting from views.py # the former function-based view is now made a class # we redefine dispatch as it is simple @@ -102,21 +105,20 @@ class RegistrationView (View): # Send email ctx = { - first_name : reg_fname, - last_name : reg_lname, - #affiliation : reg_aff, - authority_hrn: reg_auth, - email : reg_email, - keypair : keypair, - cc_myself : True # form.cleaned_data['cc_myself'] + 'first_name' : reg_fname, + 'last_name' : reg_lname, + 'authority_hrn': reg_auth, + 'email' : reg_email, + 'keypair' : keypair, + 'cc_myself' : True # form.cleaned_data['cc_myself'] } - recipients = authority_get_pi_emails(authority_hrn) + recipients = authority_get_pi_emails(request,reg_auth) if ctx['cc_myself']: recipients.append(ctx['email']) msg = render_to_string('user_request_email.txt', ctx) - send_mail("Onelab New User request for %s submitted"%email, msg, email, recipients) + send_mail("Onelab New User request for %s submitted"%reg_email, msg, reg_email, recipients) return render(request, 'user_register_complete.html') @@ -129,5 +131,5 @@ class RegistrationView (View): 'authority_hrn': request.POST.get('authority_hrn', ''), 'email': request.POST.get('email', ''), 'password': request.POST.get('password', ''), - 'authorities': authorities + 'authorities': authorities, })