X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Factions.py;h=53d0a7840b1a81a307b37dcc187446fb60b1abb0;hb=a8a54f34297f76d9379070f0fd2c1bec9f761c47;hp=3a4fe56ce5870b94c4e5017e771946446a99e12a;hpb=8c8f04ea43ed69b7a81c90f456b1153a4167a72f;p=myslice.git

diff --git a/portal/actions.py b/portal/actions.py
index 3a4fe56c..53d0a784 100644
--- a/portal/actions.py
+++ b/portal/actions.py
@@ -49,24 +49,15 @@ def manifold_add_user(request, user_params):
     return result['email']
 
 def manifold_update_user(request, user_params):
-    # user_params: email, password e.g., user_params = {'password':'demo','config':'{"firstname":"ME"}'}
-    query = Query.update('local:user').set(user_params).select('email')
+    # 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)
-    if not results:
-        raise Exception, "Failed updating manifold user: %s" % user_params['email']
-    result, = results
-    return result['email']
-
-
-#def manifold_update_user(request,user_params):
-#    # user_params: password and config
-#    query = Query.update('local:user').set(user_params).select(['password','config'])
-#    results = execute_query(request,query)
-#    if not results:
-#        raise Exception, "Failed updating manifold user: password %s and config %s" % (user_params['password'],user_params['config'])
-#    result, = results
-#    return (result['password'],result['config'])
-
+    # 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 user: %s" % user_params['email']
+    #result, = results
+    return results
 
 def manifold_add_account(request, account_params):
     query = Query.create('local:account').set(account_params).select(['user', 'platform'])
@@ -78,12 +69,14 @@ def manifold_add_account(request, account_params):
 
 def manifold_update_account(request,account_params):
     # account_params: config
-    query = Query.update('local:account').set(account_params).select('config')
+    query = Query.update('local:account').filter_by('email', '==', request.user.email).set(account_params).select('email')
     results = execute_query(request,query)
-    if not results:
-        raise Exception, "Failed updating manifold account: config %s" % account_params['config']
-    result, = results
-    return result['config']
+    # 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
+    return results
 
 
 def make_request_user(user):