X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fhomeview.py;h=a910f74f2f7b2517b991d8abc881f5257c3f827f;hb=c8d5c8180ee140b573188ca78b0df1995f20e908;hp=029dc316778c293b927633b8b7c718743703c1fb;hpb=e8b8c02d51026521418ec98f641c8f14f790fda7;p=unfold.git diff --git a/portal/homeview.py b/portal/homeview.py index 029dc316..a910f74f 100644 --- a/portal/homeview.py +++ b/portal/homeview.py @@ -75,7 +75,7 @@ class HomeView (FreeAccessView, ThemeView): if 'myslice' in platform_detail['platform']: acc_auth_cred = account_config.get('delegated_authority_credentials','N/A') # assigning values - if acc_auth_cred == {}: + if acc_auth_cred=={} or acc_auth_cred=='N/A': pi = "is_not_pi" else: pi = "is_pi" @@ -97,21 +97,24 @@ class HomeView (FreeAccessView, ThemeView): def get (self, request, state=None): env = self.default_env() + acc_auth_cred={} if request.user.is_authenticated(): ## check user is pi or not platform_query = Query().get('local:platform').select('platform_id','platform','gateway_type','disabled') account_query = Query().get('local:account').select('user_id','platform_id','auth_type','config') + # 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_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') + if 'platform_id' in platform_details: + 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 == {}: + if acc_auth_cred=={} or acc_auth_cred=='N/A': pi = "is_not_pi" else: pi = "is_pi"