X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fhomeview.py;h=a261bc36012b3b0e6edbb2934dfc5f68a58aad47;hb=7426a25d89f0a5c02abfcc22e2f8eb9458a66966;hp=3e9514f3aab3887693a9ddacab9eb47652e7b592;hpb=7464fb5c0d4d4857963b52b944b27df41e4ec1f6;p=unfold.git

diff --git a/portal/homeview.py b/portal/homeview.py
index 3e9514f3..a261bc36 100644
--- a/portal/homeview.py
+++ b/portal/homeview.py
@@ -19,6 +19,7 @@ from myslice.configengine               import ConfigEngine
 from myslice.theme                      import ThemeView
 from portal.account                     import Account, get_expiration
 from portal.models                      import PendingSlice
+from portal.actions                     import authority_check_pis
 
 import json, time
 import activity.user
@@ -60,7 +61,6 @@ class HomeView (FreeAccessView, ThemeView):
         elif auth_result is not None:
             user=auth_result
             if user.is_active:
-                print "LOGGING IN"
                 login(request, user)
                 
                 if request.user.is_authenticated(): 
@@ -89,10 +89,12 @@ class HomeView (FreeAccessView, ThemeView):
                                             acc_auth_cred = account_config.get('delegated_authority_credentials','N/A')
                                             acc_user_cred = account_config.get('delegated_user_credential','N/A')
                     # assigning values
-                    if acc_auth_cred=={} or acc_auth_cred=='N/A':
-                        pi = "is_not_pi"
-                    else:
-                        pi = "is_pi"
+                    #if acc_auth_cred=={} or acc_auth_cred=='N/A':
+                    #    pi = "is_not_pi"
+                    #else:
+                    #    pi = "is_pi"
+                    user_email = str(self.request.user)                   
+                    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':
@@ -156,11 +158,12 @@ class HomeView (FreeAccessView, ThemeView):
                                         acc_auth_cred = account_config.get('delegated_authority_credentials','N/A')
                                         acc_user_cred = account_config.get('delegated_user_credential','N/A')
             # assigning values
-            if acc_auth_cred=={} or acc_auth_cred=='N/A':
-                pi = "is_not_pi"
-            else:
-                pi = "is_pi"
-
+            #if acc_auth_cred=={} or acc_auth_cred=='N/A':
+            #    pi = "is_not_pi"
+            #else:
+            #    pi = "is_pi"
+            user_email = str(self.request.user) 
+            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':
                 user_cred = 'no_creds'