X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=auth%2Fviews.py;h=d1e78b5373b9e2ef38087a9170e8e35355bb2f93;hb=7b569e0b595b4be76de46385536a22e234dae9e4;hp=9d718504dc38df1a113d86b40b259720677bd4e3;hpb=89b5d553be498ec100b9403746951140e68994be;p=myslice.git diff --git a/auth/views.py b/auth/views.py index 9d718504..d1e78b53 100644 --- a/auth/views.py +++ b/auth/views.py @@ -7,6 +7,8 @@ from django.http import HttpResponseRedirect from auth.backend import MyCustomBackend +from myslice.viewutils import the_user + def login_user(request): state = "Please log in below..." username = password = '' @@ -30,7 +32,8 @@ def login_user(request): return render_to_response('view-login.html',env, context_instance=RequestContext(request)) else: state='Welcome to MySlice' - env['state']=state; env['username']='' + 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 ? @@ -38,7 +41,8 @@ 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',{},context_instance=RequestContext(request)) + 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