X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fvalidationview.py;h=b8454f037901d76df4ac466e67a48296fa2ff491;hb=a5d8ec473bf69cbb0540e3afadd66e1b57ebeff4;hp=65506e3eccd45947332c763285c245671160811c;hpb=3d80b8c60c3f3ecad72c8280cc3a7be11b62e3c7;p=myslice.git diff --git a/portal/validationview.py b/portal/validationview.py index 65506e3e..b8454f03 100644 --- a/portal/validationview.py +++ b/portal/validationview.py @@ -50,6 +50,7 @@ class ValidatePendingView(LoginRequiredAutoLogoutView, ThemeView): template_name = "validate_pending.html" def get_context_data(self, **kwargs): + pi = "" # We might have slices on different registries with different user accounts # We note that this portal could be specific to a given registry, to which we register users, but i'm not sure that simplifies things # Different registries mean different identities, unless we identify via SFA HRN or have associated the user email to a single hrn @@ -257,24 +258,6 @@ class ValidatePendingView(LoginRequiredAutoLogoutView, ThemeView): if not auth_hrn in dest: dest[auth_hrn] = [] dest[auth_hrn].append(request) - - ## 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') - # assigning values - if acc_auth_cred == {}: - pi = "is_not_pi" - else: - pi = "is_pi" context = super(ValidatePendingView, self).get_context_data(**kwargs) context['my_authorities'] = ctx_my_authorities @@ -288,7 +271,7 @@ class ValidatePendingView(LoginRequiredAutoLogoutView, ThemeView): context['topmenu_items'] = topmenu_items_live('Validation', page) # so we can sho who is logged context['username'] = the_user(self.request) - context['pi'] = pi + context['pi'] = "is_pi" context['theme'] = self.theme context['section'] = "Requests" # XXX We need to prepare the page for queries