X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Faccountview.py;h=ce504ac2acbf69963a32b6ce0cceac32611a209f;hb=3d16aa36af64e8e0e5ce3a48c34df158fbfaae29;hp=f366555d829b446a1ddb9ba0bfd211b5282b51b5;hpb=1efbe9b835aaef87a925440f13c6ef00b128c7b9;p=myslice.git

diff --git a/portal/accountview.py b/portal/accountview.py
index f366555d..ce504ac2 100644
--- a/portal/accountview.py
+++ b/portal/accountview.py
@@ -12,11 +12,13 @@ from django.contrib                     import messages
 from django.contrib.auth.decorators     import login_required
 from django.core.mail                   import send_mail
 
+from theme import ThemeView
+
 #
 import json, os, re, itertools
 
 # requires login
-class AccountView(LoginRequiredAutoLogoutView):
+class AccountView(LoginRequiredAutoLogoutView, ThemeView):
     template_name = "account-view.html"
     def dispatch(self, *args, **kwargs):
         return super(AccountView, self).dispatch(*args, **kwargs)
@@ -200,6 +202,7 @@ class AccountView(LoginRequiredAutoLogoutView):
         context['topmenu_items'] = topmenu_items_live('My Account', page)
         # so we can sho who is logged
         context['username'] = the_user(self.request)
+        context['theme'] = self.theme
 #        context ['firstname'] = config['firstname']
         prelude_env = page.prelude_env()
         context.update(prelude_env)
@@ -236,7 +239,7 @@ def account_process(request):
             if 'delete_'+platform_detail['platform'] in request.POST:
                 platform_id = platform_detail['platform_id']
                 user_params = {'user_id':user_id}
-                manifold_delete_account(request,platform_id,user_params)
+                manifold_delete_account(request,platform_id, user_id, user_params)
                 messages.info(request, 'Reference Account is removed from the selected platform')
                 return HttpResponseRedirect("/portal/account/")
 
@@ -328,7 +331,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')
@@ -336,11 +339,11 @@ def account_process(request):
                         updated_config = json.dumps(account_config) 
                         # updating manifold
                         user_params = { 'config': keypair, 'auth_type':'managed'}
-                        manifold_update_account(request,user_params)
+                        manifold_update_account(request, user_id, 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("/portal/account/")
         else:
@@ -367,7 +370,10 @@ def account_process(request):
                             file_content = ''.join(file_content.split())
                             #update manifold local:account table
                             user_params = { 'config': file_content, 'auth_type':'user'}
-                            manifold_update_account(request,user_params)
+                            manifold_update_account(request, user_id, 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:
@@ -424,7 +430,7 @@ def account_process(request):
                                 
                             updated_config = json.dumps(account_config)
                             user_params = { 'config': updated_config, 'auth_type':'user'}
-                            manifold_update_account(request,user_params)
+                            manifold_update_account(request, user_id, user_params)
                             messages.success(request, 'Private Key deleted. You need to delegate credentials manually once it expires.')
                             messages.success(request, 'Once your credentials expire, Please delegate manually using SFA: http://trac.myslice.info/wiki/DelegatingCredentials')
                             return HttpResponseRedirect("/portal/account/")
@@ -450,7 +456,7 @@ def account_process(request):
                             user_priv_key = json.dumps(account_config.get('user_private_key','N/A'))
                             updated_config = '{"user_public_key":'+ user_pub_key + ', "user_private_key":'+ user_priv_key + ', "user_hrn":"'+ user_hrn + '"}'
                             user_params = { 'config': updated_config}
-                            manifold_update_account(request,user_params)
+                            manifold_update_account(request,user_id, user_params)
                             messages.success(request, 'All Credentials cleared')
                             return HttpResponseRedirect("/portal/account/")
                         else: