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 (from parent 1:
5f6aeda
)
MyACC: Update
author
Yasin
<mohammed-yasin.rahman@lip6.fr>
Mon, 17 Feb 2014 17:39:00 +0000
(18:39 +0100)
committer
Yasin
<mohammed-yasin.rahman@lip6.fr>
Mon, 17 Feb 2014 17:39:00 +0000
(18:39 +0100)
portal/accountview.py
patch
|
blob
|
history
diff --git
a/portal/accountview.py
b/portal/accountview.py
index
2a929bd
..
05d1372
100644
(file)
--- a/
portal/accountview.py
+++ b/
portal/accountview.py
@@
-336,7
+336,7
@@
def account_process(request):
updated_config = json.dumps(account_config)
# updating manifold
user_params = { 'config': keypair, 'auth_type':'managed'}
updated_config = json.dumps(account_config)
# updating manifold
user_params = { 'config': keypair, 'auth_type':'managed'}
- manifold_update_account(request,user_params)
+ manifold_update_account(request,
user_id,
user_params)
# updating sfa
public_key = public_key.replace('"', '');
user_pub_key = {'keys': public_key}
# updating sfa
public_key = public_key.replace('"', '');
user_pub_key = {'keys': public_key}
@@
-367,7
+367,7
@@
def account_process(request):
file_content = ''.join(file_content.split())
#update manifold local:account table
user_params = { 'config': file_content, 'auth_type':'user'}
file_content = ''.join(file_content.split())
#update manifold local:account table
user_params = { 'config': file_content, 'auth_type':'user'}
- manifold_update_account(request,user_params)
+ manifold_update_account(request,
user_id,
user_params)
# updating sfa
user_pub_key = {'keys': file_content}
sfa_update_user(request, user_hrn, user_pub_key)
# updating sfa
user_pub_key = {'keys': file_content}
sfa_update_user(request, user_hrn, user_pub_key)
@@
-427,7
+427,7
@@
def account_process(request):
updated_config = json.dumps(account_config)
user_params = { 'config': updated_config, 'auth_type':'user'}
updated_config = json.dumps(account_config)
user_params = { 'config': updated_config, 'auth_type':'user'}
- manifold_update_account(request,user_params)
+ manifold_update_account(request,
user_id,
user_params)
messages.success(request, 'Private Key deleted. You need to delegate credentials manually once it expires.')
messages.success(request, 'Once your credentials expire, Please delegate manually using SFA: http://trac.myslice.info/wiki/DelegatingCredentials')
return HttpResponseRedirect("/portal/account/")
messages.success(request, 'Private Key deleted. You need to delegate credentials manually once it expires.')
messages.success(request, 'Once your credentials expire, Please delegate manually using SFA: http://trac.myslice.info/wiki/DelegatingCredentials')
return HttpResponseRedirect("/portal/account/")
@@
-453,7
+453,7
@@
def account_process(request):
user_priv_key = json.dumps(account_config.get('user_private_key','N/A'))
updated_config = '{"user_public_key":'+ user_pub_key + ', "user_private_key":'+ user_priv_key + ', "user_hrn":"'+ user_hrn + '"}'
user_params = { 'config': updated_config}
user_priv_key = json.dumps(account_config.get('user_private_key','N/A'))
updated_config = '{"user_public_key":'+ user_pub_key + ', "user_private_key":'+ user_priv_key + ', "user_hrn":"'+ user_hrn + '"}'
user_params = { 'config': updated_config}
- manifold_update_account(request,user_params)
+ manifold_update_account(request,user_
id, user_
params)
messages.success(request, 'All Credentials cleared')
return HttpResponseRedirect("/portal/account/")
else:
messages.success(request, 'All Credentials cleared')
return HttpResponseRedirect("/portal/account/")
else: