X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fhomeview.py;h=fbe3ed6f99a7c731a62f09124601989ce797a66f;hb=b4969d314fe2004575a14b79dd337b6a5cc3fc5b;hp=44bcf70b2e058b1adf673f69eed8531945bb487d;hpb=4235d206977901782d7dafd183ebd2b695891171;p=myslice.git

diff --git a/portal/homeview.py b/portal/homeview.py
index 44bcf70b..fbe3ed6f 100644
--- a/portal/homeview.py
+++ b/portal/homeview.py
@@ -23,6 +23,8 @@ from portal.account                     import Account, get_expiration
 from portal.models                      import PendingSlice
 from portal.actions                     import authority_check_pis, get_jfed_identity, get_myslice_account
 
+from myslice.settings import logger
+
 import activity.user
 
 class HomeView (FreeAccessView, ThemeView):
@@ -86,7 +88,7 @@ class HomeView (FreeAccessView, ThemeView):
                         #else:
                         #    pi = "is_pi"
                         user_email = str(self.request.user)
-                        pi = authority_check_pis(self.request, 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':
@@ -104,7 +106,7 @@ class HomeView (FreeAccessView, ThemeView):
                             pending_slices.append(slices.slice_name)
 
                         env['pending_slices'] = pending_slices
-                        env['pi'] = pi
+                        #env['pi'] = pi
                         env['user_cred'] = user_cred
                     except Exception as e:
                         print e
@@ -131,7 +133,11 @@ class HomeView (FreeAccessView, ThemeView):
             # log user activity
             activity.user.login(self.request, "error")
             env['state'] = "Your username and/or password were incorrect."
+
+        env['next'] = request.POST.get('next',None)
         env['request'] = request
+        if env['next']:
+            return HttpResponseRedirect(env['next'])
         return render_to_response(self.template,env, context_instance=RequestContext(request))
 
     def get (self, request, state=None):
@@ -168,7 +174,7 @@ class HomeView (FreeAccessView, ThemeView):
                 #else:
                 #    pi = "is_pi"
                 user_email = str(self.request.user)
-                pi = authority_check_pis(self.request, 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':
                     user_cred = 'no_creds'
@@ -185,7 +191,7 @@ class HomeView (FreeAccessView, ThemeView):
                     pending_slices.append(slices.slice_name)
 
                 env['pending_slices'] = pending_slices
-                env['pi'] = pi
+                #env['pi'] = pi
                 env['user_cred'] = user_cred
                 env['person'] = self.request.user
             else:
@@ -197,7 +203,8 @@ class HomeView (FreeAccessView, ThemeView):
 
         env['theme'] = self.theme
         env['section'] = "Dashboard"
-
+        logger.debug("homeview called")
+        env['next'] = request.GET.get('next',None)
         env['username']=the_user(request)
         env['topmenu_items'] = topmenu_items(None, request)
         env['request'] = request