SimpleList No Result optional warning msg

[unfold.git] / portal / actions.py

diff --git a/portal/actions.py b/portal/actions.py
index 3ad61fd..c8aa5b7 100644 (file)
--- a/portal/actions.py
+++ b/portal/actions.py
@@ -60,10 +60,10 @@ def manifold_add_user(request, user_params):
     result, = results
     return result['email']
 
-def manifold_update_user(request, user_params):
+def manifold_update_user(request, email, user_params):
     # user_params: password, config e.g., 
-    query = Query.update('local:user').filter_by('email', '==', request.user.email).set(user_params).select('email')
-    results = execute_query(request,query)
+    query = Query.update('local:user').filter_by('email', '==', email).set(user_params).select('email')
+    results = execute_admin_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:
@@ -90,9 +90,16 @@ def manifold_update_account(request,account_params):
     #result, = results
     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)
+    return results
+
 
+#not tested
 def manifold_add_platform(request, platform_params):
-    query = Query.create('local:platform').set(account_params).select(['user', 'platform'])
+    query = Query.create('local:platform').set(platform_params).select(['user', 'platform'])
     results = execute_admin_query(request,query)
     if not results:
         raise Exception, "Failed creating manifold  platform %s for user: %s" % (platform_params['platform'], platform_params['user'])
@@ -182,7 +189,9 @@ def portal_validate_request(wsgi_request, request_ids):
         if request['type'] == 'user':
 
             try:
-                hrn = "%s.%s" % (request['authority_hrn'], request['login'])
+                # XXX tmp user_hrn inside the keypair column of pendiguser table
+                hrn = json.loads(request['keypair'])['user_hrn']
+                #hrn = "%s.%s" % (request['authority_hrn'], request['login'])
                 # XXX tmp sfa dependency
                 from sfa.util.xrn import Xrn 
                 urn = Xrn(hrn, request['type']).get_urn()