From: Yasin <mohammed-yasin.rahman@lip6.fr>
Date: Mon, 13 Jan 2014 14:05:51 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/myslice
X-Git-Tag: myslice-0.3-0~36^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=aa08833827d3ea4e1b27b5c079eca15a0ef023a9;hp=-c;p=unfold.git

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

aa08833827d3ea4e1b27b5c079eca15a0ef023a9
diff --combined portal/registrationview.py
index 64eca81f,62c09347..f0fcd90a
--- a/portal/registrationview.py
+++ b/portal/registrationview.py
@@@ -45,12 -45,14 +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
  
@@@ -143,7 -145,7 +145,7 @@@
                  )
                  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'])
 +                user = User.objects.create_user(reg_email, 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}