X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=auth%2Fviews.py;h=43ca56eaae92f12f8c5e7adddead0fe851556fdd;hb=7b1bc5bd58de4f06a193f3dd344df7b342504cbf;hp=c26bc1d06b728ae9fb801922d21549cdd4e8fa7c;hpb=96a59721af48d73df6e504807378c52fa1750743;p=myslice.git diff --git a/auth/views.py b/auth/views.py index c26bc1d0..43ca56ea 100644 --- a/auth/views.py +++ b/auth/views.py @@ -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,14 +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 + # check that we're indeed logged in if not request.user.is_authenticated(): return HttpResponseRedirect ('/') logout(request)