Merge branch 'fibre' of ssh://git.onelab.eu/git/myslice into fibre

[unfold.git] / portal / institution.py

diff --git a/portal/institution.py b/portal/institution.py
index 6c55517..6dd1b20 100644 (file)
--- a/portal/institution.py
+++ b/portal/institution.py
@@ -5,7 +5,7 @@ from django.template                import RequestContext
 from django.shortcuts               import render_to_response
 from django.shortcuts               import render
 
-from unfold.loginrequired           import FreeAccessView
+from unfold.loginrequired           import LoginRequiredAutoLogoutView
 
 from manifold.core.query            import Query
 from manifoldapi.manifoldapi        import execute_query
@@ -13,10 +13,10 @@ from manifoldapi.manifoldresult     import ManifoldResult
 from ui.topmenu                     import topmenu_items, the_user
 from myslice.configengine           import ConfigEngine
 
-from theme                          import ThemeView
+from myslice.theme                          import ThemeView
 import json
 
-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
@@ -66,7 +66,7 @@ class InstitutionView (FreeAccessView, ThemeView):
                             if 'myslice' in platform_detail['platform']:
                                 acc_auth_cred = account_config.get('delegated_authority_credentials','N/A')
             # assigning values
-            if acc_auth_cred == {}:
+            if acc_auth_cred == {} or acc_auth_cred == 'N/A':
                 pi = "is_not_pi"
             else:
                 pi = "is_pi"
@@ -75,6 +75,7 @@ class InstitutionView (FreeAccessView, ThemeView):
             env['person'] = None
     
         env['theme'] = self.theme
+        env['section'] = "Institution"
         env['pi'] = pi 
         env['username']=the_user(request)
         env['topmenu_items'] = topmenu_items(None, request)