git://git.onelab.eu
/
unfold.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
[unfold.git]
/
portal
/
registrationview.py
diff --git
a/portal/registrationview.py
b/portal/registrationview.py
index
88bd5ae
..
46c64b1
100644
(file)
--- a/
portal/registrationview.py
+++ b/
portal/registrationview.py
@@
-45,28
+45,39
@@
class RegistrationView (FreeAccessView, ThemeView):
# Page rendering
page = Page(wsgi_request)
# Page rendering
page = Page(wsgi_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_js_files ( [ "js/jquery.validate.js", "js/my_account.register.js"
, "js/jquery.qtip.min.js"
] )
+ page.add_css_files ( [ "css/onelab.css", "css/registration.css"
, "css/jquery.qtip.min.css"
] )
page.add_css_files ( [ "https://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" ] )
if method == 'POST':
page.add_css_files ( [ "https://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" ] )
if method == 'POST':
+ reg_form = {}
# The form has been submitted
# get the domain url
current_site = Site.objects.get_current()
current_site = current_site.domain
# The form has been submitted
# get the domain url
current_site = Site.objects.get_current()
current_site = current_site.domain
+ authorities_query = Query.get('authority').select('name', 'authority_hrn')
+ authorities = execute_admin_query(wsgi_request, authorities_query)
+
+ for authority in authorities:
+ if authority['name'] == wsgi_request.POST.get('org_name', ''):
+ authority_hrn = authority['authority_hrn']
+
post_email = wsgi_request.POST.get('email','').lower()
post_email = wsgi_request.POST.get('email','').lower()
- email_hash = md5(post_email).digest().encode('base64')[:-1]
+ salt = randint(1,100000)
+ email_hash = md5(str(salt)+post_email).hexdigest()
+ #email_hash = md5(post_email).digest().encode('base64')[:-1]
user_request = {
'first_name' : wsgi_request.POST.get('firstname', ''),
'last_name' : wsgi_request.POST.get('lastname', ''),
user_request = {
'first_name' : wsgi_request.POST.get('firstname', ''),
'last_name' : wsgi_request.POST.get('lastname', ''),
- 'authority_hrn' : wsgi_request.POST.get('authority_hrn', ''),
+ 'organization' : wsgi_request.POST.get('org_name', ''),
+ 'authority_hrn' : authority_hrn,
'email' : post_email,
'password' : wsgi_request.POST.get('password', ''),
'current_site' : current_site,
'email_hash' : email_hash,
'email' : post_email,
'password' : wsgi_request.POST.get('password', ''),
'current_site' : current_site,
'email_hash' : email_hash,
- 'validation_link': 'http
s
://' + current_site + '/portal/email_activation/'+ email_hash
+ 'validation_link': 'http://' + current_site + '/portal/email_activation/'+ email_hash
}
# Construct user_hrn from email (XXX Should use common code)
}
# Construct user_hrn from email (XXX Should use common code)
@@
-142,6
+153,12
@@
class RegistrationView (FreeAccessView, ThemeView):
else:
user_request = {}
else:
user_request = {}
+ ## this is coming from onelab website onelab.eu
+ reg_form = {
+ 'first_name': wsgi_request.GET.get('first_name', ''),
+ 'last_name': wsgi_request.GET.get('last_name', ''),
+ 'email': wsgi_request.GET.get('email', ''),
+ }
template_env = {
'topmenu_items': topmenu_items_live('Register', page),
template_env = {
'topmenu_items': topmenu_items_live('Register', page),
@@
-150,5
+167,6
@@
class RegistrationView (FreeAccessView, ThemeView):
'theme': self.theme
}
template_env.update(user_request)
'theme': self.theme
}
template_env.update(user_request)
+ template_env.update(reg_form)
template_env.update(page.prelude_env ())
return render(wsgi_request, self.template,template_env)
template_env.update(page.prelude_env ())
return render(wsgi_request, self.template,template_env)