From faff7d4312753dcd49eab496884bcbf0483f17c7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jordan=20Aug=C3=A9?= Date: Wed, 26 Feb 2014 18:29:18 +0100 Subject: [PATCH] Fixed case if a user has an account with an empty config field --- portal/accountview.py | 9 +++++---- portal/manageuserview.py | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) 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') -- 2.43.0