X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=auth%2Fviews.py;h=43ca56eaae92f12f8c5e7adddead0fe851556fdd;hb=dd6a3c82ae4bc1f7cea47551a546b2f7aeda3df6;hp=5237a645333686f43801b50c7b52e395baac17ef;hpb=b490e035bac3b74b66130548f5a4bf4a30ad8375;p=myslice.git

diff --git a/auth/views.py b/auth/views.py
index 5237a645..43ca56ea 100644
--- a/auth/views.py
+++ b/auth/views.py
@@ -14,7 +14,7 @@ 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:
@@ -29,7 +29,8 @@ def login_user(request):
             if user.is_active:
                 login(request, user)
                 #state = "You're successfully logged in!"
-                return HttpResponseRedirect ('/login-ok')
+                return HttpResponseRedirect ('/portal/dashboard')
+                #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))
@@ -37,21 +38,14 @@ def login_user(request):
             env['state'] = "Your username and/or password were incorrect."
             return render_to_response('view-login.html',env, context_instance=RequestContext(request))
     else:
-        state='Welcome to MySlice'
+        state='' #Welcome to MySlice'
         env['state']=state
         env['username']=the_user(request)
         return render_to_response('view-login.html',env, context_instance=RequestContext(request))
 
 # hard question : where should we redirect requests to logout if user is not logged in ?
 def logout_user (request):
-    # xxx check that we're indeed logged in
-    if not request.user.is_authenticated():
-        return HttpResponseRedirect ('/')
-    return render_to_response('view-logout.html',{'username':the_user(request)},
-                              context_instance=RequestContext(request))
-
-def do_logout_user (request):
-    # xxx check that we're indeed logged in
+    # check that we're indeed logged in
     if not request.user.is_authenticated():
         return HttpResponseRedirect ('/')
     logout(request)