From 4474607b73117f62ea1efebefdff08c65239dc85 Mon Sep 17 00:00:00 2001 From: Yasin Date: Wed, 3 Sep 2014 17:18:31 +0200 Subject: [PATCH] No Credentials: warning message added for all cases (manual+auto delegation) --- portal/accountview.py | 29 +++++++++------ .../templates/onelab/onelab_account-view.html | 36 +++++++++++++++++++ .../onelab/onelab_registration_view.html | 2 +- 3 files changed, 55 insertions(+), 12 deletions(-) diff --git a/portal/accountview.py b/portal/accountview.py index bf033e63..50483839 100644 --- a/portal/accountview.py +++ b/portal/accountview.py @@ -189,29 +189,36 @@ class AccountView(LoginRequiredAutoLogoutView, ThemeView): ## 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') - 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') + # 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') + # 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') # assigning values if acc_auth_cred == {} or acc_auth_cred == 'N/A': pi = "is_not_pi" else: pi = "is_pi" + # check if the user has creds or not + if acc_user_cred == {} or acc_user_cred == 'N/A': + user_cred = 'no_creds' + else: + user_cred = 'has_creds' + context = super(AccountView, self).get_context_data(**kwargs) context['principal_acc'] = principal_acc_list context['ref_acc'] = ref_acc_list context['platform_list'] = platform_list context['my_users'] = my_users context['pi'] = pi + context['user_cred'] = user_cred context['my_slices'] = my_slices context['my_auths'] = my_auths context['user_status'] = user_status diff --git a/portal/templates/onelab/onelab_account-view.html b/portal/templates/onelab/onelab_account-view.html index 585e39bd..5aa4fc36 100644 --- a/portal/templates/onelab/onelab_account-view.html +++ b/portal/templates/onelab/onelab_account-view.html @@ -194,6 +194,9 @@

Credentials Delegated to Principal Account

+ {%if 'no_creds' in user_cred %} +

NO CREDENTIALS are delegated to the portal!

+ {%endif%} @@ -264,6 +267,39 @@ {%endif%} + + +
diff --git a/portal/templates/onelab/onelab_registration_view.html b/portal/templates/onelab/onelab_registration_view.html index ad725404..fddf6ab5 100644 --- a/portal/templates/onelab/onelab_registration_view.html +++ b/portal/templates/onelab/onelab_registration_view.html @@ -83,7 +83,7 @@
In order for the portal to contact testbeds on your behalf, so as to list and reserve resources, you will need to - delegate your public key to the portal. + delegate your credentials to the portal.
-- 2.43.0
Delegated User Credential
Expiration Date