From: Loic Baron <loic.baron@lip6.fr>
Date: Thu, 22 Jan 2015 15:41:56 +0000 (+0100)
Subject: Projects with institution and dashboard
X-Git-Tag: myslice-1.3~106^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=3a41bc1b767999975ebcfcfa1dae41d05af2b9b3;p=myslice.git

Projects with institution and dashboard
---

diff --git a/portal/homeview.py b/portal/homeview.py
index 214bd7f3..1fe1d2a3 100644
--- a/portal/homeview.py
+++ b/portal/homeview.py
@@ -95,7 +95,7 @@ class HomeView (FreeAccessView, ThemeView):
                     #else:
                     #    pi = "is_pi"
                     user_email = str(self.request.user)                   
-                    pi = authority_check_pis(self.reques, user_email)
+                    pi = authority_check_pis(self.request, user_email)
 
                     # check if the user has creds or not
                     if acc_user_cred == {} or acc_user_cred == 'N/A':
diff --git a/portal/institution.py b/portal/institution.py
index cf0055ce..bdb7ad64 100644
--- a/portal/institution.py
+++ b/portal/institution.py
@@ -31,7 +31,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 10da9c6c..1f5ceca2 100644
--- 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 f168167a..6c217600 100644
--- 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>
@@ -192,9 +192,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) {