ManageUser: GenKey, Add, Remove platforms enabled

diff --git a/portal/actions.py b/portal/actions.py
index 3ee568c..f935ada 100644 (file)
--- a/portal/actions.py
+++ b/portal/actions.py
@@ -113,7 +113,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('platform', '==', 'myslice').set(account_params).select('user_id')
 def manifold_update_account(request,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)
+    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:
     # 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:


@@ -124,7 +124,7 @@ def manifold_update_account(request,account_params):
 #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')
 #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)
+    results = execute_admin_query(request,query)

     return results
 
 
     return results
 
 

diff --git a/portal/manageuserview.py b/portal/manageuserview.py
index 3f3ebde..5c9ad23 100644 (file)
--- 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'] 
         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'
             # 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']
     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)
 
     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
                         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:
                         messages.success(request, 'Sucess: New Keypair Generated! Delegation of your credentials will be automatic.')
                         return HttpResponseRedirect(redirect_url)
         else: