layout changes

[unfold.git] / portal / actions.py

diff --git a/portal/actions.py b/portal/actions.py
index abd29df..c22d8fb 100644 (file)
--- a/portal/actions.py
+++ b/portal/actions.py
@@ -1,6 +1,6 @@
 from django.http                 import HttpResponse
 from manifold.core.query         import Query
-from manifold.manifoldapi        import execute_query,execute_admin_query
+from manifoldapi.manifoldapi        import execute_query,execute_admin_query
 from portal.models               import PendingUser, PendingSlice, PendingAuthority
 import json
 
@@ -14,7 +14,7 @@ import json
 
 def authority_get_pis(request, authority_hrn):
     query = Query.get('authority').filter_by('authority_hrn', '==', authority_hrn).select('pi_users')
-    results = execute_query(request, query)
+    results = execute_admin_query(request, query)
     # NOTE: temporarily commented. Because results is giving empty list. 
     # Needs more debugging
     #if not results:
@@ -24,14 +24,23 @@ def authority_get_pis(request, authority_hrn):
     return results
 
 def authority_get_pi_emails(request, authority_hrn):
-    return ['jordan.auge@lip6.fr', 'loic.baron@lip6.fr']
-
+    #return ['jordan.auge@lip6.fr', 'loic.baron@lip6.fr']
     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)
-    print "mails",  [result['email'] for result in results]
-    return [result['email'] for result in results]
+    if any(d['pi_users'] == None for d in pi_users):
+        return ['support@myslice.info']
+    else:
+        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_admin_query(request, query)
+        print "mails",  [result['email'] for result in results]
+        return [result['email'] for result in results]
+
+# SFA get record
+
+def sfa_get_user(request, user_hrn, pub):
+    query_sfa_user = Query.get('user').filter_by('user_hrn', '==', user_hrn)
+    result_sfa_user = execute_query(request, query_sfa_user)
+    return result_sfa_user                        
 
 # SFA add record (user, slice)
 
@@ -110,21 +119,16 @@ def manifold_add_account(request, account_params):
     result, = results
     return result['user_id']
 
-def manifold_update_account(request,account_params):
+def manifold_update_account(request,user_id,account_params):
     # account_params: config
-    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 
-    #if not results:
-    #    raise Exception, "Failed updating manifold account: config %s" % account_params['config']
-    #result, = results
+    query = Query.update('local:account').filter_by('platform', '==', 'myslice').filter_by('user_id', '==', user_id).set(account_params).select('user_id')
+    results = execute_admin_query(request,query)
     return results
 
 #explicitly mention the platform_id
-def manifold_delete_account(request, platform_id, account_params):
-    query = Query.delete('local:account').filter_by('platform_id', '==', platform_id).set(account_params).select('user_id')
-    results = execute_query(request,query)
+def manifold_delete_account(request, platform_id, user_id, account_params):
+    query = Query.delete('local:account').filter_by('platform_id', '==', platform_id).filter_by('user_id', '==', user_id).set(account_params).select('user_id')
+    results = execute_admin_query(request,query)
     return results