From 52d15bb9ffa5309091f3aacaaeaa87e22a4acac3 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Thu, 2 Jul 2009 22:19:04 +0000 Subject: Get import and logged in detection working right. --- docs/tutorials/bfgwiki/src/authorization/tutorial/login.py | 4 ++-- docs/tutorials/bfgwiki/src/authorization/tutorial/views.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'docs/tutorials/bfgwiki') diff --git a/docs/tutorials/bfgwiki/src/authorization/tutorial/login.py b/docs/tutorials/bfgwiki/src/authorization/tutorial/login.py index 293f3dcd5..70697ec2e 100644 --- a/docs/tutorials/bfgwiki/src/authorization/tutorial/login.py +++ b/docs/tutorials/bfgwiki/src/authorization/tutorial/login.py @@ -8,12 +8,12 @@ from repoze.bfg.security import remember from repoze.bfg.security import forget from tutorial.models import Wiki -from tutorial.run import USERS +from tutorial.security import USERS @bfg_view(for_=Wiki, name='login') def login(context, request): login_url = model_url(context, request, 'login') - referrer = request.environ.get('HTTP_REFERER', '/') + referrer = request.url if referrer == login_url: referrer = '/' # never use the login form itself as came_from came_from = request.params.get('came_from', referrer) diff --git a/docs/tutorials/bfgwiki/src/authorization/tutorial/views.py b/docs/tutorials/bfgwiki/src/authorization/tutorial/views.py index c8c02e57e..59042c511 100644 --- a/docs/tutorials/bfgwiki/src/authorization/tutorial/views.py +++ b/docs/tutorials/bfgwiki/src/authorization/tutorial/views.py @@ -68,7 +68,7 @@ def add_page(context, request): page.__name__ = name page.__parent__ = context - logged_in = 'repoze.who.identity' in request.environ + logged_in = authenticated_userid(request) return render_template_to_response('templates/edit.pt', request = request, @@ -82,7 +82,7 @@ def edit_page(context, request): context.data = request.params['body'] return HTTPFound(location = model_url(context, request)) - logged_in = 'repoze.who.identity' in request.environ + logged_in = authenticated_userid(request) return render_template_to_response('templates/edit.pt', request = request, -- cgit v1.2.3