git://git.onelab.eu
/
myslice.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fa59e18
)
Registration: Bugfix. Add user+account in manifold
author
Yasin
<mohammed-yasin.rahman@lip6.fr>
Thu, 28 Nov 2013 15:38:29 +0000
(16:38 +0100)
committer
Yasin
<mohammed-yasin.rahman@lip6.fr>
Thu, 28 Nov 2013 15:38:29 +0000
(16:38 +0100)
portal/registrationview.py
patch
|
blob
|
history
diff --git
a/portal/registrationview.py
b/portal/registrationview.py
index
f28ccb7
..
8f7032b
100644
(file)
--- a/
portal/registrationview.py
+++ b/
portal/registrationview.py
@@
-34,7
+34,7
@@
class RegistrationView (FreeAccessView):
#authorities_query = Query.get('authority').\
# select('name', 'authority_hrn')
#authorities_query = Query.get('authority').\
# select('name', 'authority_hrn')
- onelab_enabled_query = Query.get('local:platform').filter_by('platform', '==', 'ple').filter_by('disabled', '==', 'False')
+
#
onelab_enabled_query = Query.get('local:platform').filter_by('platform', '==', 'ple').filter_by('disabled', '==', 'False')
#onelab_enabled = not not execute_admin_query(request, onelab_enabled_query)
#if onelab_enabled:
if True:
#onelab_enabled = not not execute_admin_query(request, onelab_enabled_query)
#if onelab_enabled:
if True:
@@
-78,10
+78,10
@@
class RegistrationView (FreeAccessView):
errors.append('Last Name may contain only letters, numbers, spaces and @/./+/-/_ characters.')
# XXX validate authority hrn !!
if PendingUser.objects.filter(email__iexact=reg_email):
errors.append('Last Name may contain only letters, numbers, spaces and @/./+/-/_ characters.')
# XXX validate authority hrn !!
if PendingUser.objects.filter(email__iexact=reg_email):
- errors.append('Email is pending for validation.Please provide a new email address.')
+ errors.append('Email is pending for validation.
Please provide a new email address.')
for user_detail in user_details:
if user_detail['email']==reg_email:
for user_detail in user_details:
if user_detail['email']==reg_email:
- errors.append('Email already exists in Manifold.Please provide a new email address.')
+ errors.append('Email already exists in Manifold.
Please provide a new email address.')
# XXX TODO: Factorize with portal/accountview.py
if 'generate' in request.POST['question']:
# XXX TODO: Factorize with portal/accountview.py
if 'generate' in request.POST['question']:
@@
-138,10
+138,15
@@
class RegistrationView (FreeAccessView):
keypair = keypair,
)
b.save()
keypair = keypair,
)
b.save()
- #
saving to manifold
- config = '{"firstname":
'+ reg_fname + ', "lastname":'+ reg_lname + '
, "authority":"'+ reg_auth + '"}'
+ #
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}
user_params = {'email': reg_email, 'password': request.POST['password'], 'config': config}
- manifold_add_user(request,user_params)
+ manifold_add_user(request,user_params)
+ #creating local:account in manifold
+ user_id = user_detail['user_id']+1 # the user_id for the newly created user in local:user
+ user_params = {'platform_id': 5, 'user_id': user_id, 'auth_type': auth_type, 'config': keypair}
+ manifold_add_account(request,user_params)
+
# Send email
ctx = {
'first_name' : reg_fname,
# Send email
ctx = {
'first_name' : reg_fname,
@@
-159,17
+164,7
@@
class RegistrationView (FreeAccessView):
msg = render_to_string('user_request_email.txt', ctx)
send_mail("Onelab New User request for %s submitted"%reg_email, msg, reg_email, recipients)
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')
-
- #creating local:account in manifold
- for user_detail in user_details:
- if user_detail['email']==reg_email:
- user_id = user_detail['user_id']
-
- user_params = {'platform_id': 5, 'user_id': user_id, 'auth_type': auth_type, 'config': keypair}
- manifold_add_account(request,user_params)
- # return render(request, 'user_register_complete.html')
+ return render(request, 'user_register_complete.html')
template_env = {
'topmenu_items': topmenu_items('Register', request),
template_env = {
'topmenu_items': topmenu_items('Register', request),