X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Finstitution.py;h=f0a3b2db1822e74f4048166069bfd0d8792fa7f9;hb=89af8babd28a7da90ffe59be3ce7b7e812734cd0;hp=30ef1867777fa15402ca87e3d441581c1c60475b;hpb=75bdd644e3e782d80a988646a4bb85cd71159bb8;p=myslice.git

diff --git a/portal/institution.py b/portal/institution.py
index 30ef1867..f0a3b2db 100644
--- a/portal/institution.py
+++ b/portal/institution.py
@@ -1,3 +1,5 @@
+import json
+
 from django.core.context_processors import csrf
 from django.http                    import HttpResponseRedirect
 from django.contrib.auth            import authenticate, login, logout
@@ -5,7 +7,8 @@ from django.template                import RequestContext
 from django.shortcuts               import render_to_response
 from django.shortcuts               import render
 
-from unfold.loginrequired           import FreeAccessView
+from unfold.page                    import Page
+from unfold.loginrequired           import LoginRequiredAutoLogoutView
 
 from manifold.core.query            import Query
 from manifoldapi.manifoldapi        import execute_query
@@ -13,10 +16,12 @@ from manifoldapi.manifoldresult     import ManifoldResult
 from ui.topmenu                     import topmenu_items, the_user
 from myslice.configengine           import ConfigEngine
 
-from theme                          import ThemeView
-import json
+from portal.actions                 import is_pi, authority_check_pis
+from myslice.theme                  import ThemeView
+from myslice.settings               import logger
+
 
-class InstitutionView (FreeAccessView, ThemeView):
+class InstitutionView (LoginRequiredAutoLogoutView, ThemeView):
     template_name = 'institution.html'
         
     # expose this so we can mention the backend URL on the welcome page
@@ -28,36 +33,52 @@ class InstitutionView (FreeAccessView, ThemeView):
     def post (self,request):
         env = self.default_env()
         env['theme'] = self.theme
+        env['request'] = request
         return render_to_response(self.template, env, context_instance=RequestContext(request))
 
-    def get (self, request, state=None):
+    def get (self, request, authority_hrn=None, state=None):
         env = self.default_env()
-
         if request.user.is_authenticated(): 
             env['person'] = self.request.user
-            user_query  = Query().get('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]
-            except Exception,e:
-                env['error'] = "Please check your Credentials"
-            
-            try:
-                user_local_query  = Query().get('local:user').select('config').filter_by('email','==',str(env['person']))
-                user_local_details = execute_query(self.request, user_local_query)
-                user_local = user_local_details[0]            
-                user_local_config = user_local['config']
-                user_local_config = json.loads(user_local_config)
-                user_local_authority = user_local_config.get('authority')
-                if 'user_details' not in env or 'parent_authority' not in env['user_details'] or env['user_details']['parent_authority'] is None:
-                    env['user_details'] = {'parent_authority': user_local_authority}
-            except Exception,e:
-                env['error'] = "Please check your Manifold user config"
+            if authority_hrn is None: 
+                # 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]
+                except Exception,e:
+                    # If the Query fails, check in local DB 
+                    try:
+                        user_local_query  = Query().get('local:user').select('config').filter_by('email','==',str(env['person']))
+                        user_local_details = execute_query(self.request, user_local_query)
+                        user_local = user_local_details[0]            
+                        user_local_config = user_local['config']
+                        user_local_config = json.loads(user_local_config)
+                        user_local_authority = user_local_config.get('authority')
+                        if 'user_details' not in env or 'parent_authority' not in env['user_details'] or env['user_details']['parent_authority'] is None:
+                            env['user_details'] = {'parent_authority': user_local_authority}
+                    except Exception,e:
+                        env['error'] = "Please check your Credentials"
+            else:
+                env['project'] = True
+                env['user_details'] = {'parent_authority': authority_hrn}
+
+            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 
         env['username']=the_user(request)
         env['topmenu_items'] = topmenu_items(None, request)
         if state: env['state'] = state
@@ -65,6 +86,6 @@ class InstitutionView (FreeAccessView, ThemeView):
         # use one or two columns for the layout - not logged in users will see the login prompt
         env['layout_1_or_2']="layout-unfold2.html" if not env['username'] else "layout-unfold1.html"
         
-        
+        env['request'] = request
         return render_to_response(self.template, env, context_instance=RequestContext(request))