X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=portal%2Fregistrationview.py;h=aefdaa71b0bbf46794863a527826ca83bcb4c8e4;hb=52a295822d9deb7632d6a29d7658fda656d44d6c;hp=59f0802784a5b11d8b48254838fb6eda8f4f9574;hpb=3dcb52389db54ea18854885a7107ec4058ea4dda;p=myslice.git

diff --git a/portal/registrationview.py b/portal/registrationview.py
index 59f08027..aefdaa71 100644
--- a/portal/registrationview.py
+++ b/portal/registrationview.py
@@ -7,7 +7,7 @@ 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 ui.topmenu                 import topmenu_items
 
 from manifold.manifoldapi       import execute_query
 from manifold.core.query        import Query
@@ -86,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].')
 
@@ -106,19 +108,22 @@ class RegistrationView (View):
 
                 # 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']
+                    'first_name'    : reg_fname, 
+                    'last_name'     : reg_lname, 
+                    'authority_hrn' : reg_auth,
+                    'email'         : reg_email, 
+                    'keypair'       : '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'
-                recipients.append(ctx['email'])
+                recipients = ['devel@myslice.info']
+                if ctx['cc_myself']:
+                    recipients.append(ctx['email'])
 
                 msg = render_to_string('user_request_email.txt', ctx)
+                print "tesing msg"
+                print msg
                 send_mail("Onelab New User request for %s submitted"%reg_email, msg, reg_email, recipients)
 
                 return render(request, 'user_register_complete.html')