X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=blobdiff_plain;f=portal%2Fmanageuserview.py;h=6e55b8426d702d34f8384c2090386d16bb81bcbd;hp=3f3ebde6aa30c58198c8246ec6fbb277b871e43d;hb=9e8fe5f8fa341f4bb636f3b257fe6f83fb0b8938;hpb=d25b15bb54f4d6b26664d7c2554f632d767e461b diff --git a/portal/manageuserview.py b/portal/manageuserview.py index 3f3ebde6..6e55b842 100644 --- a/portal/manageuserview.py +++ b/portal/manageuserview.py @@ -41,8 +41,6 @@ class UserView(LoginRequiredAutoLogoutView): for user_detail in user_details: user_id = user_detail['user_id'] user_email = user_detail['email'] - print "hello_world" - print user_id # different significations of user_status if user_detail['status'] == 0: user_status = 'Disabled' @@ -231,7 +229,7 @@ def user_process(request, **kwargs): for user_detail in user_details: user_id = user_detail['user_id'] user_email = user_detail['email'] - + account_query = Query().get('local:account').filter_by('user_id', '==', user_id).select('user_id','platform_id','auth_type','config') account_details = execute_admin_query(request, account_query) @@ -365,9 +363,9 @@ def user_process(request, **kwargs): user_params = { 'config': keypair, 'auth_type':'managed'} manifold_update_account(request,user_params) # updating sfa - public_key = public_key.replace('"', ''); - user_pub_key = {'keys': public_key} - sfa_update_user(request, user_hrn, user_pub_key) + #public_key = public_key.replace('"', ''); + #user_pub_key = {'keys': public_key} + #sfa_update_user(request, user_hrn, user_pub_key) messages.success(request, 'Sucess: New Keypair Generated! Delegation of your credentials will be automatic.') return HttpResponseRedirect(redirect_url) else: @@ -396,10 +394,10 @@ def user_process(request, **kwargs): user_params = { 'config': file_content, 'auth_type':'user'} manifold_update_account(request,user_params) # updating sfa - user_pub_key = {'keys': file_content} - sfa_update_user(request, user_hrn, user_pub_key) + #user_pub_key = {'keys': file_content} + #sfa_update_user(request, user_hrn, user_pub_key) messages.success(request, 'Publickey uploaded! Please delegate your credentials using SFA: http://trac.myslice.info/wiki/DelegatingCredentials') - return HttpResponseRedirect("/portal/account/") + return HttpResponseRedirect(redirect_url) else: messages.error(request, 'RSA key error: Please upload a valid RSA public key [.txt or .pub].') return HttpResponseRedirect(redirect_url)