From: Loic Baron <loic.baron@lip6.fr>
Date: Mon, 13 Apr 2015 16:21:38 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.3~37^2~17^2~4
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=38246e458d7376845f110d5dbfcc4d8ae874f277;p=myslice.git

Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

Conflicts:
	portal/accountview.py
---

38246e458d7376845f110d5dbfcc4d8ae874f277
diff --cc portal/accountview.py
index 20fbe55a,c43d1606..076f993f
--- a/portal/accountview.py
+++ b/portal/accountview.py
@@@ -478,24 -543,32 +489,24 @@@ def account_process(request)
              return HttpResponseRedirect("/portal/account/")
      
      elif 'delete' in request.POST or request.POST['button_value'] == 'delete':
 -        for account_detail in account_details:
 -            for platform_detail in platform_details:
 -                if platform_detail['platform_id'] == account_detail['platform_id']:
 -                    if 'myslice' in platform_detail['platform']:
 -                        account_config = json.loads(account_detail['config'])
 -                        if 'user_private_key' in account_config:
 -                            for key in account_config.keys():
 -                                if key == 'user_private_key':    
 -                                    del account_config[key]
 -                                
 -                            updated_config = json.dumps(account_config)
 -                            user_params = { 'config': updated_config, 'auth_type':'user'}
 -                            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/")
 -                        else:
 -                            messages.error(request, 'Delete error: Private key is not stored in the server')
 -                            return HttpResponseRedirect("/portal/account/")
 -                           
 -        else:
 +        try:
 +            account_config = json.loads(account_detail['config'])
 +            if 'user_private_key' in account_config:
 +                for key in account_config.keys():
 +                    if key == 'user_private_key':    
 +                        del account_config[key]
 +                    
 +                updated_config = json.dumps(account_config)
 +                user_params = { 'config': updated_config, 'auth_type':'user'}
 +                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/")
 +            else:
 +                messages.error(request, 'Delete error: Private key is not stored in the server')
 +                return HttpResponseRedirect("/portal/account/")
-                            
++                          
 +        except Exception as e:
              messages.error(request, 'Account error: You need an account in myslice platform to perform this action')    
              return HttpResponseRedirect("/portal/account/")