X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Finstitution.py;h=6dd1b20a0e8fca35119313e0ad617cd70c1b07a8;hb=refs%2Fheads%2Ffibre;hp=6c55517dcc1eebc97707465ff9726320ccc3ffb3;hpb=20bf3e41d306603b85e85c3f7ca2816b28c668ae;p=unfold.git diff --git a/portal/institution.py b/portal/institution.py index 6c55517d..6dd1b20a 100644 --- 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)