Registration: email format imporved

[myslice.git] / portal / registrationview.py

diff --git a/portal/registrationview.py b/portal/registrationview.py
index 9d6c569..7f7bab7 100644 (file)
--- a/portal/registrationview.py
+++ b/portal/registrationview.py
@@ -6,6 +6,7 @@ from django.views.generic       import View
 from django.template.loader     import render_to_string
 from django.shortcuts           import render
 
+from unfold.page                import Page
 from myslice.viewutils          import topmenu_items
 
 from manifold.manifoldapi       import execute_query
@@ -33,6 +34,14 @@ class RegistrationView (View):
             select('name', 'authority_hrn')
         #authorities_query = Query.get('authority').select('authority_hrn')
         authorities = execute_query(request, authorities_query)
+        # xxx tocheck - if authorities is empty, it's no use anyway
+        # (users won't be able to validate the form anyway)
+
+        page = Page(request)
+        page.add_js_files  ( [ "js/jquery.validate.js", "js/my_account.register.js" ] )
+        page.add_css_files ( [ "css/onelab.css", "css/registration.css" ] )
+
+        print 'registration view, method',request.method
 
         if request.method == 'POST':
             # We shall use a form here
@@ -77,6 +86,8 @@ class RegistrationView (View):
                     keypair = re.sub("\r", "", keypair)
                     keypair = re.sub("\n", "\\n",keypair)
                     keypair = ''.join(keypair.split())
+                    # for sending email
+                    public_key = file_content
                 else:
                     errors.append('Please upload a valid RSA public key [.txt or .pub].')
 
@@ -84,44 +95,47 @@ class RegistrationView (View):
             #                email=reg_email, password=request.POST['password'], keypair=keypair)
             #b.save()
             if not errors:
-              b = PendingUser(
-                first_name=reg_fname, 
-                last_name=reg_lname, 
-                #affiliation=reg_aff,
-                authority_hrn=reg_auth,
-                email=reg_email, 
-                password=request.POST['password'],
-                keypair=keypair
-                )
-              b.save()
-
-              # Send email
-              ctx = {
-                '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(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"%reg_email, msg, reg_email, recipients)
-
-            return render(request, 'user_register_complete.html')
-
-        return render(request, 'registration_view.html',{
-            'topmenu_items': topmenu_items('Register', request),
-            'errors': errors,
-            'firstname': request.POST.get('firstname', ''),
-            'lastname': request.POST.get('lastname', ''),
-            #'affiliation': request.POST.get('affiliation', ''),
-            'authority_hrn': request.POST.get('authority_hrn', ''),
-            'email': request.POST.get('email', ''),
-            'password': request.POST.get('password', ''),           
-            'authorities': authorities,
-            })
+                b = PendingUser(
+                    first_name=reg_fname, 
+                    last_name=reg_lname, 
+                    #affiliation=reg_aff,
+                    authority_hrn=reg_auth,
+                    email=reg_email, 
+                    password=request.POST['password'],
+                    keypair=keypair
+                    )
+                b.save()
+
+                # Send email
+                ctx = {
+                    'First Name'    : reg_fname, 
+                    'Last Name'     : reg_lname, 
+                    'Authority'     : reg_auth,
+                    'Email'         : reg_email, 
+                    'Public Key'    : public_key,
+                    'cc_myself'     : True # form.cleaned_data['cc_myself']
+                    }
+                #not working
+                #recipients = authority_get_pi_emails(request,reg_auth)
+                recipients = ['devel@myslice.info']
+                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"%reg_email, msg, reg_email, recipients)
+
+                return render(request, 'user_register_complete.html')
+
+        template_env = {
+          'topmenu_items': topmenu_items('Register', request),
+          'errors': errors,
+          'firstname': request.POST.get('firstname', ''),
+          'lastname': request.POST.get('lastname', ''),
+          #'affiliation': request.POST.get('affiliation', ''),
+          'authority_hrn': request.POST.get('authority_hrn', ''),
+          'email': request.POST.get('email', ''),
+          'password': request.POST.get('password', ''),           
+          'authorities': authorities,
+          }
+        template_env.update(page.prelude_env ())
+        return render(request, 'registration_view.html',template_env)