X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Factions.py;h=c66b10a3db90368635157bc5af12aab0a031ceb4;hb=cde551bd551d1b7b77534777d151cb4cfe25ce53;hp=03a0e93b029ad78864be7d90275c4aa0fbe41bbe;hpb=1aea42c3668602aacfe22bc762ee939672129f53;p=myslice.git diff --git a/portal/actions.py b/portal/actions.py index 03a0e93b..c66b10a3 100644 --- a/portal/actions.py +++ b/portal/actions.py @@ -18,12 +18,12 @@ def authority_get_pis(request, authority_hrn): return results def authority_get_pi_emails(request,authority_hrn): - user_hrns = authority_get_pis(request,authority_hrn) - - query = Query.get('user').filter_by('user_hrn', 'included', user_hrns).select('user_email') + pi_users = authority_get_pis(request,authority_hrn) + pi_user_hrns = [ hrn for x in pi_users for hrn in x['pi_users'] ] + query = Query.get('user').filter_by('user_hrn', 'included', pi_user_hrns).select('email') results = execute_query(request,query) - - return [result['user_email'] for result in results] + print "mails", [result['email'] for result in results] + return [result['email'] for result in results] # SFA add record (user, slice) @@ -72,7 +72,7 @@ def manifold_add_account(request, account_params): def manifold_update_account(request,account_params): # account_params: config - query = Query.update('local:account').filter_by('email', '==', request.user.email).set(account_params).select('email') + query = Query.update('local:account').filter_by('platform', '==', 'myslice').set(account_params).select('user_id') results = execute_query(request,query) # NOTE: results remains empty and goes to Exception. However, it updates the manifold DB. # That's why I commented the exception part. -- Yasin