X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Faccountview.py;h=2a929bde34a5081a61952473a92c5bdd9e4e07c6;hb=895077c501dd3a8f950f4a8d45f6e26c04a84b87;hp=5447bce8230dbb2d9cc4596ee42e7816be9ac066;hpb=ebeba293279784d5281c8a13bdf2dae9cf4aed37;p=myslice.git

diff --git a/portal/accountview.py b/portal/accountview.py
index 5447bce8..2a929bde 100644
--- a/portal/accountview.py
+++ b/portal/accountview.py
@@ -29,12 +29,21 @@ class AccountView(LoginRequiredAutoLogoutView):
         page.add_css_files ( [ "css/onelab.css", "css/account_view.css","css/plugin.css" ] )
 
 
-        user_query  = Query().get('local:user').select('config','email')
+        user_query  = Query().get('local:user').select('config','email','status')
         user_details = execute_query(self.request, user_query)
         
         # not always found in user_details...
         config={}
         for user_detail in user_details:
+            # different significations of user_status
+            if user_detail['status'] == 0: 
+                user_status = 'Disabled'
+            elif user_detail['status'] == 1:
+                user_status = 'Validation Pending'
+            elif user_detail['status'] == 2:
+                user_status = 'Enabled'
+            else:
+                user_status = 'N/A'
             #email = user_detail['email']
             if user_detail['config']:
                 config = json.loads(user_detail['config'])
@@ -56,6 +65,7 @@ class AccountView(LoginRequiredAutoLogoutView):
         my_auths = ''
         ref_acc_list = ''
         principal_acc_list = ''
+        user_status_list = []
         platform_name_list = []
         platform_name_secondary_list = []
         platform_access_list = []
@@ -85,7 +95,7 @@ class AccountView(LoginRequiredAutoLogoutView):
                     account_usr_hrn = account_config.get('user_hrn','N/A')
                     account_pub_key = account_config.get('user_public_key','N/A')
                     account_reference = account_config.get ('reference_platform','N/A')
-                    # credentials
+                    # credentials of myslice platform
                     if 'myslice' in platform_detail['platform']:
                         acc_user_cred = account_config.get('delegated_user_credential','N/A')
                         acc_slice_cred = account_config.get('delegated_slice_credentials','N/A')
@@ -149,9 +159,10 @@ class AccountView(LoginRequiredAutoLogoutView):
                         delegation_type_list.append(delegation)
                         usr_hrn_list.append(account_usr_hrn)
                         pub_key_list.append(account_pub_key)
+                        user_status_list.append(user_status)
                         # combining 5 lists into 1 [to render in the template] 
-                        principal_acc_list = [{'platform_name': t[0], 'account_type': t[1], 'delegation_type': t[2], 'usr_hrn':t[3], 'usr_pubkey':t[4]} 
-                            for t in zip(platform_name_list, account_type_list, delegation_type_list, usr_hrn_list, pub_key_list)]
+                        principal_acc_list = [{'platform_name': t[0], 'account_type': t[1], 'delegation_type': t[2], 'usr_hrn':t[3], 'usr_pubkey':t[4], 'user_status':t[5],} 
+                            for t in zip(platform_name_list, account_type_list, delegation_type_list, usr_hrn_list, pub_key_list, user_status_list)]
                     # to hide private key row if it doesn't exist    
                     if 'myslice' in platform_detail['platform']:
                         account_config = json.loads(account_detail['config'])
@@ -174,6 +185,7 @@ class AccountView(LoginRequiredAutoLogoutView):
         context['my_users'] = my_users
         context['my_slices'] = my_slices
         context['my_auths'] = my_auths
+        context['user_status'] = user_status
         context['person']   = self.request.user
         context['firstname'] = config.get('firstname',"?")
         context['lastname'] = config.get('lastname',"?")
@@ -316,7 +328,7 @@ def account_process(request):
                         private_key = json.dumps(private.exportKey())
                         public  = private.publickey()
                         public_key = json.dumps(public.exportKey(format='OpenSSH'))
-                        # updating maniolf local:account table
+                        # updating manifold local:account table
                         account_config = json.loads(account_detail['config'])
                         # preserving user_hrn
                         user_hrn = account_config.get('user_hrn','N/A')
@@ -356,6 +368,9 @@ def account_process(request):
                             #update manifold local:account table
                             user_params = { 'config': file_content, 'auth_type':'user'}
                             manifold_update_account(request,user_params)
+                            # updating sfa
+                            user_pub_key = {'keys': file_content}
+                            sfa_update_user(request, user_hrn, user_pub_key)
                             messages.success(request, 'Publickey uploaded! Please delegate your credentials using SFA: http://trac.myslice.info/wiki/DelegatingCredentials')
                             return HttpResponseRedirect("/portal/account/")
                         else: