X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=auth%2Fviews.py;h=6490ef59f1184e08cf3dbd52b6226cbc3152d43e;hb=ff946fd2021dc5ed503b4d6169d2bb78769adbbd;hp=f6afa3fb57a4812ca8ca4cdb22981482a4244d27;hpb=8247ee9b8c0108bfe23a677485172950b0a2eed5;p=unfold.git

diff --git a/auth/views.py b/auth/views.py
index f6afa3fb..6490ef59 100644
--- a/auth/views.py
+++ b/auth/views.py
@@ -14,19 +14,22 @@ def login_user(request):
     state = "Please log in below..."
     username = password = ''
     env={'hard_wired_users':MyCustomBackend.hard_wired_users,
-         'manifold_url':Config.manifold_url(),
+         'manifold_url':Config.manifold_url,
          }
 
     if request.POST:
         username = request.POST.get('username')
         password = request.POST.get('password')
+        
+        # pass request within the token, so manifold session key could be attached to the request session.
+        token = {'username': username, 'password': password, 'request': request}    
 
-        user = authenticate(username=username, password=password)
+        user = authenticate(token=token)
         if user is not None:
             if user.is_active:
                 login(request, user)
                 #state = "You're successfully logged in!"
-                return HttpResponseRedirect ('/')
+                return HttpResponseRedirect ('/login-ok')
             else:
                 env['state'] = "Your account is not active, please contact the site admin."
                 return render_to_response('view-login.html',env, context_instance=RequestContext(request))