X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fmanagementtabrequests.py;h=2d1cdefd1d46e48111e194868f4752f283f8f519;hb=ddcdaf8d61df7f4a2a0da11c23190b56ed914464;hp=d1293722ccba0d49e032dd066b93890e7cdfa584;hpb=5c6d3dfae3a4aed1a18a9f1a946655631328351d;p=myslice.git diff --git a/portal/managementtabrequests.py b/portal/managementtabrequests.py index d1293722..2d1cdefd 100644 --- a/portal/managementtabrequests.py +++ b/portal/managementtabrequests.py @@ -1,3 +1,5 @@ +import json + from django.template import RequestContext from django.shortcuts import render_to_response @@ -18,8 +20,7 @@ from manifoldapi.manifoldapi import execute_query from portal.actions import get_requests from myslice.theme import ThemeView - -import json +from myslice.settings import logger class ManagementRequestsView (LoginRequiredView, ThemeView): template_name = "management-tab-requests.html" @@ -47,7 +48,7 @@ class ManagementRequestsView (LoginRequiredView, ThemeView): sfa_platforms_query = Query().get('local:platform').filter_by('gateway_type', '==', 'sfa').select('platform_id', 'platform', 'auth_type') sfa_platforms = execute_query(self.request, sfa_platforms_query) for sfa_platform in sfa_platforms: - print "SFA PLATFORM > ", sfa_platform['platform'] + logger.info("SFA PLATFORM > {}".format(sfa_platform['platform'])) if not 'auth_type' in sfa_platform: continue auth = sfa_platform['auth_type'] @@ -55,7 +56,7 @@ class ManagementRequestsView (LoginRequiredView, ThemeView): all_authorities.append(auth) platform_ids.append(sfa_platform['platform_id']) - print "W: Hardcoding platform myslice" + logger.warning("W: Hardcoding platform myslice") # There has been a tweak on how new platforms are referencing a # so-called 'myslice' platform for storing authentication tokens. # XXX This has to be removed in final versions. @@ -88,7 +89,7 @@ class ManagementRequestsView (LoginRequiredView, ThemeView): credential_authorities.add(authority_hrn) # CACHE PB with fields - page = Page(wsgi_request) + page = Page(self.request) metadata = page.get_metadata() user_md = metadata.details_by_object('user') user_fields = [column['name'] for column in user_md['column']] @@ -101,8 +102,8 @@ class ManagementRequestsView (LoginRequiredView, ThemeView): try: for pa in pi_authorities_tmp: pi_authorities |= set(pa['pi_authorities']) - except: - print 'No pi_authorities' + except Exception as e: + logger.error('No pi_authorities') pi_credential_authorities = pi_authorities & credential_authorities pi_no_credential_authorities = pi_authorities - credential_authorities - credential_authorities_expired