Merge branch 'master' of ssh://git.onelab.eu/git/myslice

diff --combined portal/registrationview.py
index 6db03df,d2a04a9..62c0934
--- 1/portal/registrationview.py
--- 2/portal/registrationview.py
+++ b/portal/registrationview.py
@@@ -2,7 -2,7 +2,7 @@@ import os.path, r
  import json
  
  from django.core.mail           import send_mail
- 
+ from django.contrib.auth.models import User
  from django.views.generic       import View
  from django.template.loader     import render_to_string
  from django.shortcuts           import render
@@@ -45,14 -45,12 +45,14 @@@ class RegistrationView (FreeAccessView)
              print "FIREXP ENABLED"
  
          authorities = execute_admin_query(request, authorities_query)
 +        authorities = sorted(authorities)
          # 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" ] )
 +        page.add_css_files ( [ "http://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" ] )
  
          print 'registration view, method',method
  
@@@ -108,6 -106,8 +108,8 @@@
                  #keypair = re.sub("\n", "\\n", keypair)
                  #keypair = keypair.rstrip('\r\n')
                  #keypair = ''.join(keypair.split())
+                 #for sending email: removing existing double qoute 
+                 public_key = public_key.replace('"', '');
              else: 
                  up_file = request.FILES['user_public_key']
                  file_content =  up_file.read()
@@@ -122,6 -122,7 +124,7 @@@
                      auth_type = 'user'
                      # for sending email
                      public_key = file_content
+                     public_key = ''.join(public_key.split()) 
                  else:
                      errors.append('Please upload a valid RSA public key [.txt or .pub].')
  
@@@ -141,6 -142,8 +144,8 @@@
                      keypair       = keypair,
                  )
                  b.save()
+                 # saves the user to django auth_user table [needed for password reset]
+                 user = User.objects.create_user(reg_fname, reg_email, request.POST['password'])
                  #creating user to manifold local:user
                  config = '{"firstname":"'+ reg_fname + '", "lastname":"'+ reg_lname + '", "authority":"'+ reg_auth + '"}'
                  user_params = {'email': reg_email, 'password': request.POST['password'], 'config': config}
@@@ -157,7 -160,7 +162,7 @@@
                      'authority_hrn' : reg_auth,
                      'email'         : reg_email,
                      'user_hrn'      : user_hrn,
-                     'keypair'       : 'Public Key :' + public_key,
+                     'keypair'       : 'Public Key: ' + public_key,
                      'cc_myself'     : True # form.cleaned_data['cc_myself']
                      }
                  recipients = authority_get_pi_emails(request,reg_auth)