X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Finstitution.py;h=cc5a722682cbc2787ed9620280023e215b6a1e82;hb=873a1e187cfdf103fe56b62ee565770b2d9f4b10;hp=bdb7ad64a241c39b52f60a14e432d2a71a68c38f;hpb=3a41bc1b767999975ebcfcfa1dae41d05af2b9b3;p=unfold.git

diff --git a/portal/institution.py b/portal/institution.py
index bdb7ad64..cc5a7226 100644
--- a/portal/institution.py
+++ b/portal/institution.py
@@ -5,6 +5,7 @@ from django.template                import RequestContext
 from django.shortcuts               import render_to_response
 from django.shortcuts               import render
 
+from unfold.page                    import Page
 from unfold.loginrequired           import LoginRequiredAutoLogoutView
 
 from manifold.core.query            import Query
@@ -13,7 +14,8 @@ from manifoldapi.manifoldresult     import ManifoldResult
 from ui.topmenu                     import topmenu_items, the_user
 from myslice.configengine           import ConfigEngine
 
-from myslice.theme                          import ThemeView
+from portal.actions                 import is_pi, authority_check_pis
+from myslice.theme                  import ThemeView
 import json
 
 class InstitutionView (LoginRequiredAutoLogoutView, ThemeView):
@@ -35,7 +37,15 @@ class InstitutionView (LoginRequiredAutoLogoutView, ThemeView):
         if request.user.is_authenticated(): 
             env['person'] = self.request.user
             if authority_hrn is None: 
-                user_query  = Query().get('myslice:user').select('user_hrn','parent_authority').filter_by('user_hrn','==','$user_hrn')
+                # CACHE PB with fields
+                page = Page(request)
+                metadata = page.get_metadata()
+                user_md = metadata.details_by_object('user')
+                user_fields = [column['name'] for column in user_md['column']]
+                
+                # REGISTRY ONLY TO BE REMOVED WITH MANIFOLD-V2
+                user_query  = Query().get('myslice:user').select(user_fields).filter_by('user_hrn','==','$user_hrn')
+                #user_query  = Query().get('myslice:user').select('user_hrn','parent_authority').filter_by('user_hrn','==','$user_hrn')
                 user_details = execute_query(self.request, user_query)
                 try:
                     env['user_details'] = user_details[0]
@@ -55,27 +65,13 @@ class InstitutionView (LoginRequiredAutoLogoutView, ThemeView):
             else:
                 env['project'] = True
                 env['user_details'] = {'parent_authority': authority_hrn}
-            ## 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 == {} or acc_auth_cred == 'N/A':
-                pi = "is_not_pi"
-            else:
-                pi = "is_pi"
 
+            logger.debug("BEFORE  ####------####  is_pi")
+            logger.debug("is_pi = {}".format(is_pi))
+            pi = is_pi(self.request, '$user_hrn', env['user_details']['parent_authority']) 
         else: 
             env['person'] = None
-    
+            pi = False
         env['theme'] = self.theme
         env['section'] = "Institution"
         env['pi'] = pi