t pushMerge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

diff --git a/portal/institution.py b/portal/institution.py
index fd62015..77cea8d 100644 (file)
--- a/portal/institution.py
+++ b/portal/institution.py
@@ -32,7 +32,6 @@ class InstitutionView (LoginRequiredAutoLogoutView, ThemeView):
         return render_to_response(self.template, env, context_instance=RequestContext(request))
 
     def get (self, request, authority_hrn=None, state=None):
-        print " -----  institution",authority_hrn
         env = self.default_env()
         if request.user.is_authenticated(): 
             env['person'] = self.request.user

diff --git a/portal/managementtababout.py b/portal/managementtababout.py
index 10da9c6..1f5ceca 100644 (file)
--- a/portal/managementtababout.py
+++ b/portal/managementtababout.py
@@ -29,7 +29,7 @@ class ManagementAboutView (FreeAccessView, ThemeView):
             # select column.name from local:object where table=='authority'
             authority_query = Query().get('authority').select('authority_hrn', 'name', 'address', 'enabled','description', 
                                                               'scientific', 'city', 'name', 'url', 'country', 'enabled', 'longitude', 
-                                                              'tech', 'latitude', 'pi_users', 'parent_authority', 'onelab_membership', 
+                                                              'tech', 'latitude', 'pi_users', 'onelab_membership', 
                                                               'postcode').filter_by('authority_hrn','==',user_authority)
             authority_details = execute_query(self.request, authority_query)
             

diff --git a/portal/templates/institution.html b/portal/templates/institution.html
index 6b7d676..26fdf0a 100644 (file)
--- a/portal/templates/institution.html
+++ b/portal/templates/institution.html
@@ -9,7 +9,7 @@
        <div class="row">
                <div class="col-md-12">
                         <div class="breadcrumbs">
-                                Management &nbsp;>&nbsp; Institution: <span id="authority_name"></span>
+                                Management &nbsp;>&nbsp; Institution: <span id="authority_name">{{user_details.parent_authority}}</span>
                         </div>
                </div>
        </div>
@@ -194,9 +194,12 @@ $(document).ready(function() {
                $(this).tab('show');
        var id = $(this).attr('href').substr(1);
         /*
-       if ((id == 'requests') || (id == 'about'))
+       if ((id == 'requests')){
                $("#" + id).load('/management/' + id);
+        }
         */
+       if ((id == 'requests') || (id == 'about'))
+               $("#" + id).load('/management/' + id);
        });
        var hash = window.location.hash;
        if (hash) {