From 51b5091377a5ab076393d48d7815faa3db623f9b Mon Sep 17 00:00:00 2001 From: Loic Baron Date: Thu, 28 Aug 2014 16:24:34 +0200 Subject: [PATCH] Homeview Session expired --- portal/homeview.py | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/portal/homeview.py b/portal/homeview.py index 7af47760..bd7b2cd8 100644 --- a/portal/homeview.py +++ b/portal/homeview.py @@ -115,22 +115,25 @@ class HomeView (FreeAccessView, ThemeView): # XXX Something like an invalid session seems to make the execute fail sometimes, and thus gives an error on the main page platform_details = execute_query(self.request, platform_query) account_details = execute_query(self.request, account_query) - for platform_detail in platform_details: - for account_detail in account_details: - if 'platform_id' in platform_detail: - if platform_detail['platform_id'] == account_detail['platform_id']: - if 'config' in account_detail and account_detail['config'] is not '': - account_config = json.loads(account_detail['config']) - if 'myslice' in platform_detail['platform']: - acc_auth_cred = account_config.get('delegated_authority_credentials','N/A') - # assigning values - if acc_auth_cred=={} or acc_auth_cred=='N/A': - pi = "is_not_pi" + if platform_details is None: + env['person'] = None else: - pi = "is_pi" - - env['pi'] = pi - env['person'] = self.request.user + for platform_detail in platform_details: + for account_detail in account_details: + if 'platform_id' in platform_detail: + if platform_detail['platform_id'] == account_detail['platform_id']: + if 'config' in account_detail and account_detail['config'] is not '': + account_config = json.loads(account_detail['config']) + if 'myslice' in platform_detail['platform']: + acc_auth_cred = account_config.get('delegated_authority_credentials','N/A') + # assigning values + if acc_auth_cred=={} or acc_auth_cred=='N/A': + pi = "is_not_pi" + else: + pi = "is_pi" + + env['pi'] = pi + env['person'] = self.request.user else: env['person'] = None -- 2.43.0