From: Jordan Augé <jordan.auge@lip6.fr>
Date: Wed, 26 Feb 2014 17:29:18 +0000 (+0100)
Subject: Fixed case if a user has an account with an empty config field
X-Git-Tag: myslice-1.1~287^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=faff7d4312753dcd49eab496884bcbf0483f17c7;hp=7337c424807101dac887cf358ea5c4d11d686e1f;p=unfold.git

Fixed case if a user has an account with an empty config field
---

diff --git a/portal/accountview.py b/portal/accountview.py
index f2b3457c..5d3c9f83 100644
--- a/portal/accountview.py
+++ b/portal/accountview.py
@@ -93,10 +93,11 @@ class AccountView(LoginRequiredAutoLogoutView, ThemeView):
             for account_detail in account_details:
                 if platform_detail['platform_id'] == account_detail['platform_id']:
                     platform_name = platform_detail['platform']
-                    account_config = json.loads(account_detail['config'])
-                    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')
+                    if 'config' in account_detail and account_detail['config'] is not '':
+                        account_config = json.loads(account_detail['config'])
+                        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 of myslice platform
                     if 'myslice' in platform_detail['platform']:
                         acc_user_cred = account_config.get('delegated_user_credential','N/A')
diff --git a/portal/manageuserview.py b/portal/manageuserview.py
index c5cda1d0..4f5c72ff 100644
--- a/portal/manageuserview.py
+++ b/portal/manageuserview.py
@@ -97,10 +97,11 @@ class UserView(LoginRequiredAutoLogoutView, ThemeView):
             for account_detail in account_details:
                 if platform_detail['platform_id'] == account_detail['platform_id']:
                     platform_name = platform_detail['platform']
-                    account_config = json.loads(account_detail['config'])
-                    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')
+                    if 'config' in account_detail and account_detail['config'] is not '':
+                        account_config = json.loads(account_detail['config'])
+                        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 of myslice platform
                     if 'myslice' in platform_detail['platform']:
                         acc_user_cred = account_config.get('delegated_user_credential','N/A')